diff --git a/Admin/Install/Workflow.install.json b/Admin/Install/Workflow.install.json index de29cca..dd92de7 100755 --- a/Admin/Install/Workflow.install.json +++ b/Admin/Install/Workflow.install.json @@ -1,11 +1,11 @@ { "triggers": [ - "PRE:Module:client-create", - "POST:Module:client-create", - "PRE:Module:client-update", - "POST:Module:client-update", - "PRE:Module:client-delete", - "POST:Module:client-delete" + "PRE:client-create", + "POST:client-create", + "PRE:client-update", + "POST:client-update", + "PRE:client-delete", + "POST:client-delete" ], "actions": { "1003100001": { diff --git a/Controller/ApiAttributeController.php b/Controller/ApiAttributeController.php index 492a3d2..42b7084 100644 --- a/Controller/ApiAttributeController.php +++ b/Controller/ApiAttributeController.php @@ -243,7 +243,7 @@ final class ApiAttributeController extends Controller ->with('type') ->with('type/defaults') ->with('value') - ->where('id', (int) $request->getData('id')) + ->where('id', $request->getDataInt('id') ?? 0) ->execute(); $new = $this->updateAttributeFromRequest($request, clone $old); @@ -291,7 +291,7 @@ final class ApiAttributeController extends Controller $clientAttribute = ClientAttributeMapper::get() ->with('type') - ->where('id', (int) $request->getData('id')) + ->where('id', $request->getDataInt('id') ?? 0) ->execute(); if ($clientAttribute->type->isRequired) { @@ -327,7 +327,7 @@ final class ApiAttributeController extends Controller } /** @var BaseStringL11n $old */ - $old = ClientAttributeTypeL11nMapper::get()->where('id', (int) $request->getData('id'))->execute(); + $old = ClientAttributeTypeL11nMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute(); $new = $this->updateAttributeTypeL11nFromRequest($request, clone $old); $this->updateModel($request->header->account, $old, $new, ClientAttributeTypeL11nMapper::class, 'client_attribute_type_l11n', $request->getOrigin()); @@ -357,7 +357,7 @@ final class ApiAttributeController extends Controller } /** @var BaseStringL11n $clientAttributeTypeL11n */ - $clientAttributeTypeL11n = ClientAttributeTypeL11nMapper::get()->where('id', (int) $request->getData('id'))->execute(); + $clientAttributeTypeL11n = ClientAttributeTypeL11nMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute(); $this->deleteModel($request->header->account, $clientAttributeTypeL11n, ClientAttributeTypeL11nMapper::class, 'client_attribute_type_l11n', $request->getOrigin()); $this->createStandardDeleteResponse($request, $response, $clientAttributeTypeL11n); } @@ -385,7 +385,7 @@ final class ApiAttributeController extends Controller } /** @var AttributeType $old */ - $old = ClientAttributeTypeMapper::get()->with('defaults')->where('id', (int) $request->getData('id'))->execute(); + $old = ClientAttributeTypeMapper::get()->with('defaults')->where('id', $request->getDataInt('id') ?? 0)->execute(); $new = $this->updateAttributeTypeFromRequest($request, clone $old); $this->updateModel($request->header->account, $old, $new, ClientAttributeTypeMapper::class, 'client_attribute_type', $request->getOrigin()); @@ -417,7 +417,7 @@ final class ApiAttributeController extends Controller } /** @var AttributeType $clientAttributeType */ - $clientAttributeType = ClientAttributeTypeMapper::get()->with('defaults')->where('id', (int) $request->getData('id'))->execute(); + $clientAttributeType = ClientAttributeTypeMapper::get()->with('defaults')->where('id', $request->getDataInt('id') ?? 0)->execute(); $this->deleteModel($request->header->account, $clientAttributeType, ClientAttributeTypeMapper::class, 'client_attribute_type', $request->getOrigin()); $this->createStandardDeleteResponse($request, $response, $clientAttributeType); } @@ -445,7 +445,7 @@ final class ApiAttributeController extends Controller } /** @var AttributeValue $old */ - $old = ClientAttributeValueMapper::get()->where('id', (int) $request->getData('id'))->execute(); + $old = ClientAttributeValueMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute(); /** @var \Modules\Attribute\Models\Attribute $attr */ $attr = ClientAttributeMapper::get() @@ -485,7 +485,7 @@ final class ApiAttributeController extends Controller // } // /** @var \Modules\ClientManagement\Models\ClientAttributeValue $clientAttributeValue */ - // $clientAttributeValue = ClientAttributeValueMapper::get()->where('id', (int) $request->getData('id'))->execute(); + // $clientAttributeValue = ClientAttributeValueMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute(); // $this->deleteModel($request->header->account, $clientAttributeValue, ClientAttributeValueMapper::class, 'client_attribute_value', $request->getOrigin()); // $this->createStandardDeleteResponse($request, $response, $clientAttributeValue); } @@ -513,7 +513,7 @@ final class ApiAttributeController extends Controller } /** @var BaseStringL11n $old */ - $old = ClientAttributeValueL11nMapper::get()->where('id', (int) $request->getData('id')); + $old = ClientAttributeValueL11nMapper::get()->where('id', $request->getDataInt('id') ?? 0); $new = $this->updateAttributeValueL11nFromRequest($request, clone $old); $this->updateModel($request->header->account, $old, $new, ClientAttributeValueL11nMapper::class, 'client_attribute_value_l11n', $request->getOrigin()); @@ -543,7 +543,7 @@ final class ApiAttributeController extends Controller } /** @var BaseStringL11n $clientAttributeValueL11n */ - $clientAttributeValueL11n = ClientAttributeValueL11nMapper::get()->where('id', (int) $request->getData('id'))->execute(); + $clientAttributeValueL11n = ClientAttributeValueL11nMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute(); $this->deleteModel($request->header->account, $clientAttributeValueL11n, ClientAttributeValueL11nMapper::class, 'client_attribute_value_l11n', $request->getOrigin()); $this->createStandardDeleteResponse($request, $response, $clientAttributeValueL11n); } diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 3374727..ef9904b 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -124,7 +124,7 @@ final class BackendController extends Controller ->with('l11n') ->with('defaults') ->with('defaults/l11n') - ->where('id', (int) $request->getData('id')) + ->where('id', $request->getDataInt('id') ?? 0) ->where('l11n/language', $response->header->l11n->language) ->where('defaults/l11n/language', [$response->header->l11n->language, null]) ->execute(); @@ -157,7 +157,7 @@ final class BackendController extends Controller $view->attribute = ClientAttributeValueMapper::get() ->with('l11n') - ->where('id', (int) $request->getData('id')) + ->where('id', $request->getDataInt('id') ?? 0) ->where('l11n/language', [$response->header->l11n->language, null]) ->execute(); diff --git a/Theme/Backend/client-view.tpl.php b/Theme/Backend/client-view.tpl.php index 5b3dcf9..e2fbfa4 100644 --- a/Theme/Backend/client-view.tpl.php +++ b/Theme/Backend/client-view.tpl.php @@ -250,7 +250,7 @@ echo $this->data['nav']->render();
- +
@@ -682,7 +682,7 @@ echo $this->data['nav']->render();
- +