diff --git a/beike/Admin/Repositories/AttributeGroupRepo.php b/beike/Admin/Repositories/AttributeGroupRepo.php index bc604c55..e66aeba3 100644 --- a/beike/Admin/Repositories/AttributeGroupRepo.php +++ b/beike/Admin/Repositories/AttributeGroupRepo.php @@ -70,7 +70,7 @@ class AttributeGroupRepo { $group = AttributeGroup::query()->findOrFail($id); if ($group->attributes->count()) { - throw new \Exception(trans('admin/attribute_groups.error_cannot_delete_attribute_used', ['attributes' => implode(', ', $group->attributes->pluck('id')->toArray())])); + throw new \Exception(trans('admin/attribute_group.error_cannot_delete_attribute_used', ['attributes' => implode(', ', $group->attributes->pluck('id')->toArray())])); } $group->descriptions()->delete(); $group->delete(); diff --git a/beike/Admin/Repositories/PermissionRepo.php b/beike/Admin/Repositories/PermissionRepo.php index fcb07046..9f6f4efc 100644 --- a/beike/Admin/Repositories/PermissionRepo.php +++ b/beike/Admin/Repositories/PermissionRepo.php @@ -49,6 +49,8 @@ class PermissionRepo ['title' => trans('admin/common.product'), 'permissions' => $this->getProductPermissions()], ['title' => trans('admin/common.category'), 'permissions' => $this->getCategoryPermissions()], ['title' => trans('admin/common.brand'), 'permissions' => $this->getBrandPermissions()], + ['title' => trans('admin/common.attribute'), 'permissions' => $this->getAttributePermissions()], + ['title' => trans('admin/common.attribute_group'), 'permissions' => $this->getAttributeGroupPermissions()], ['title' => trans('admin/common.customer'), 'permissions' => $this->getCustomerPermissions()], ['title' => trans('admin/common.customer_group'), 'permissions' => $this->getCustomerGroupPermissions()], ['title' => trans('admin/common.page'), 'permissions' => $this->getPagePermissions()], @@ -149,6 +151,32 @@ class PermissionRepo return hook_filter('role.brand_permissions', $items); } + /** + * 属性权限列表 + * + * @return \string[][] + */ + private function getAttributePermissions(): array + { + $routes = ['attributes_index', 'attributes_create', 'attributes_show', 'attributes_update', 'attributes_delete']; + $items = $this->getPermissionList('attribute', $routes); + + return hook_filter('role.attribute_permissions', $items); + } + + /** + * 属性组权限列表 + * + * @return \string[][] + */ + private function getAttributeGroupPermissions(): array + { + $routes = ['attribute_groups_index', 'attribute_groups_create', 'attribute_groups_update', 'attribute_groups_delete']; + $items = $this->getPermissionList('attribute_group', $routes); + + return hook_filter('role.attribute_group_permissions', $items); + } + /** * 客户权限列表 * diff --git a/resources/beike/admin/views/pages/attribute_group/index.blade.php b/resources/beike/admin/views/pages/attribute_group/index.blade.php index c86f72c2..46cd444f 100644 --- a/resources/beike/admin/views/pages/attribute_group/index.blade.php +++ b/resources/beike/admin/views/pages/attribute_group/index.blade.php @@ -1,12 +1,12 @@ @extends('admin::layouts.master') -@section('title', __('admin/attribute_groups.index')) +@section('title', __('admin/attribute_group.index')) @section('content')
| {{ __('common.id') }} | {{ __('common.name') }} | -{{ __('admin/attribute_groups.index') }} | +{{ __('admin/attribute_group.index') }} | {{ __('common.created_at') }} | {{ __('common.action') }} | @@ -53,7 +53,7 @@
|---|