diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index b9f0cc1..c5f63dc 100644 --- a/Admin/Routes/Web/Backend.php +++ b/Admin/Routes/Web/Backend.php @@ -6,9 +6,9 @@ use phpOMS\Account\PermissionType; use phpOMS\Router\RouteVerb; return [ - '^.*/accounting/attribute/type/list(\?.*$|$)' => [ + '^.*/accounting/asset/attribute/type/list(\?.*$|$)' => [ [ - 'dest' => '\Modules\EquipmentManagement\Controller\BackendController:viewEquipmentManagementAttributeTypeList', + 'dest' => '\Modules\AssetManagement\Controller\BackendController:viewAssetManagementAttributeTypeList', 'verb' => RouteVerb::GET, 'permission' => [ 'module' => BackendController::NAME, @@ -17,9 +17,9 @@ return [ ], ], ], - '^.*/accounting/attribute/type(\?.*$|$)' => [ + '^.*/accounting/asset/attribute/type/view(\?.*$|$)' => [ [ - 'dest' => '\Modules\EquipmentManagement\Controller\BackendController:viewEquipmentManagementAttributeType', + 'dest' => '\Modules\AssetManagement\Controller\BackendController:viewAssetManagementAttributeType', 'verb' => RouteVerb::GET, 'permission' => [ 'module' => BackendController::NAME, @@ -79,7 +79,7 @@ return [ 'verb' => RouteVerb::GET, 'permission' => [ 'module' => BackendController::MODULE_NAME, - 'type' => PermissionType::READ, + 'type' => PermissionType::CREATE, 'state' => PermissionCategory::ASSET, ], ], diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 9c4f2ab..7939184 100644 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -86,8 +86,11 @@ final class BackendController extends Controller /** @var \Modules\Attribute\Models\AttributeType $attribute */ $attribute = AssetAttributeTypeMapper::get() ->with('l11n') + ->with('defaults') + ->with('defaults/l11n') ->where('id', (int) $request->getData('id')) ->where('l11n/language', $response->header->l11n->language) + ->where('defaults/l11n/language', [$response->header->l11n->language, null]) ->execute(); $l11ns = AssetAttributeTypeL11nMapper::getAll() diff --git a/Theme/Backend/asset-list.tpl.php b/Theme/Backend/asset-list.tpl.php index d2c6aa3..96ba322 100644 --- a/Theme/Backend/asset-list.tpl.php +++ b/Theme/Backend/asset-list.tpl.php @@ -85,7 +85,7 @@ echo $this->data['nav']->render(); ?> ?>