github
/
halo
mirror of https://github.com/halo-dev/halo
1
0
Fork 0
Code Issues Releases Wiki Activity

feat: refine roles management 

Signed-off-by: Ryan Wang <i@ryanc.cc>
pull/3445/head
Ryan Wang 2022-07-19 11:41:05 +08:00
parent 84e4cae994
commit 1cded7a581
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/modules/system/roles/RoleDetail.vue
View File

@ -16,7 +16,6 @@ import type { Role, User } from "@halo-dev/api-client";
interface RoleTemplateGroup { interface RoleTemplateGroup {
module: string | null | undefined; module: string | null | undefined;
displayName: string | null | undefined;
roles: Role[]; roles: Role[];
} }
@ -71,10 +70,6 @@ const roleTemplateGroups = computed<RoleTemplateGroup[]>(() => {
groups.push({ groups.push({
module: module:
role.metadata.annotations?.["rbac.authorization.halo.run/module"], role.metadata.annotations?.["rbac.authorization.halo.run/module"],
displayName:
role.metadata.annotations?.[
"rbac.authorization.halo.run/display-name"
],
roles: [role], roles: [role],
}); });
} }
@ -304,7 +299,7 @@ onMounted(() => {
class="bg-white px-4 py-5 hover:bg-gray-50 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6" class="bg-white px-4 py-5 hover:bg-gray-50 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6"
> >
<dt class="text-sm font-medium text-gray-900"> <dt class="text-sm font-medium text-gray-900">
{{ group.displayName }} {{ group.module }}
</dt> </dt>
<dd class="mt-1 text-sm text-gray-900 sm:col-span-2 sm:mt-0"> <dd class="mt-1 text-sm text-gray-900 sm:col-span-2 sm:mt-0">
<ul class="space-y-2"> <ul class="space-y-2">

7
src/modules/system/roles/components/RoleCreationModal.vue
View File

@ -6,7 +6,6 @@ import type { Role } from "@halo-dev/api-client";
interface RoleTemplateGroup { interface RoleTemplateGroup {
module: string | null | undefined; module: string | null | undefined;
displayName: string | null | undefined;
roles: Role[]; roles: Role[];
} }
@ -67,10 +66,6 @@ const roleTemplateGroups = computed<RoleTemplateGroup[]>(() => {
groups.push({ groups.push({
module: module:
role.metadata.annotations?.["rbac.authorization.halo.run/module"], role.metadata.annotations?.["rbac.authorization.halo.run/module"],
displayName:
role.metadata.annotations?.[
"rbac.authorization.halo.run/display-name"
],
roles: [role], roles: [role],
}); });
} }
@ -165,7 +160,7 @@ watch(
class="bg-white px-4 py-5 hover:bg-gray-50 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6" class="bg-white px-4 py-5 hover:bg-gray-50 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6"
> >
<dt class="text-sm font-medium text-gray-900"> <dt class="text-sm font-medium text-gray-900">
{{ group.displayName }} {{ group.module }}
</dt> </dt>
<dd class="mt-1 text-sm text-gray-900 sm:col-span-2 sm:mt-0"> <dd class="mt-1 text-sm text-gray-900 sm:col-span-2 sm:mt-0">
<ul class="space-y-2"> <ul class="space-y-2">