From d8039cead5a61eea42acc081a63295d8e5e58615 Mon Sep 17 00:00:00 2001 From: TL Date: Tue, 14 Feb 2023 11:09:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B1=9E=E6=80=A7=E5=92=8C=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=E7=BB=84=E6=9D=83=E9=99=90=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Repositories/AttributeGroupRepo.php | 2 +- beike/Admin/Repositories/PermissionRepo.php | 28 +++++++++++++++++++ .../pages/attribute_group/index.blade.php | 6 ++-- .../views/pages/attributes/form.blade.php | 2 +- .../views/pages/attributes/index.blade.php | 6 ++-- resources/lang/zh_cn/admin/attribute.php | 6 ++++ ...tribute_groups.php => attribute_group.php} | 6 ++++ resources/lang/zh_cn/admin/common.php | 2 ++ 8 files changed, 50 insertions(+), 8 deletions(-) rename resources/lang/zh_cn/admin/{attribute_groups.php => attribute_group.php} (66%) 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')
- +
@@ -34,7 +34,7 @@ - diff --git a/resources/beike/admin/views/pages/attributes/form.blade.php b/resources/beike/admin/views/pages/attributes/form.blade.php index d221f14f..6da15eea 100644 --- a/resources/beike/admin/views/pages/attributes/form.blade.php +++ b/resources/beike/admin/views/pages/attributes/form.blade.php @@ -19,7 +19,7 @@ - + - + @@ -53,7 +53,7 @@ - + __('admin/attribute_groups.index')] ) }}', trigger: 'blur'}, + {required: true, message: '{{ __('common.error_required', ['name' => __('admin/attribute_group.index')] ) }}', trigger: 'blur'}, ], sort_order: [{required: true,message: '{{ __('common.error_required', ['name' => __('common.sort_order')])}}',trigger: 'blur'}, ], }, diff --git a/resources/lang/zh_cn/admin/attribute.php b/resources/lang/zh_cn/admin/attribute.php index f303f39a..d68bd270 100644 --- a/resources/lang/zh_cn/admin/attribute.php +++ b/resources/lang/zh_cn/admin/attribute.php @@ -21,4 +21,10 @@ return [ 'btn_later' => '稍后再去', 'to_info_values' => '请前往详情页编辑属性值', 'error_cannot_delete_product_used' => '属性不能删除，由于该属性被商品（商品ID: :product_ids）使用', + + 'attributes_index' => '属性列表', + 'attributes_create' => '创建属性', + 'attributes_show' => '属性详情', + 'attributes_update' => '更新属性', + 'attributes_delete' => '删除属性', ]; diff --git a/resources/lang/zh_cn/admin/attribute_groups.php b/resources/lang/zh_cn/admin/attribute_group.php similarity index 66% rename from resources/lang/zh_cn/admin/attribute_groups.php rename to resources/lang/zh_cn/admin/attribute_group.php index d25cb778..6489410b 100644 --- a/resources/lang/zh_cn/admin/attribute_groups.php +++ b/resources/lang/zh_cn/admin/attribute_group.php @@ -13,4 +13,10 @@ return [ 'index' => '属性组', 'create_at_groups' => '创建属性组', 'error_cannot_delete_attribute_used' => '属性组不能删除，由于该属性组被属性（属性ID: :attributes）使用', + + 'attribute_groups_index' => '属性组列表', + 'attribute_groups_create' => '创建属性组', + 'attribute_groups_show' => '属性组详情', + 'attribute_groups_update' => '更新属性组', + 'attribute_groups_delete' => '删除属性组', ]; diff --git a/resources/lang/zh_cn/admin/common.php b/resources/lang/zh_cn/admin/common.php index ab137a1f..c6a5e360 100644 --- a/resources/lang/zh_cn/admin/common.php +++ b/resources/lang/zh_cn/admin/common.php @@ -28,6 +28,8 @@ return [ 'rma_reason' => '退换货原因管理', 'product' => '商品管理', 'brand' => '品牌管理', + 'attribute' => '属性管理', + 'attribute_group' => '属性组管理', 'category' => '分类管理', 'customer_group' => '客户组管理', 'customer' => '客户管理',
{{ __('common.id') }} {{ __('common.name') }}{{ __('admin/attribute_groups.index') }}{{ __('admin/attribute_group.index') }} {{ __('common.created_at') }} {{ __('common.action') }}