Skip to content

Commit 349e13d

Browse files
committed
Fix contextual role editing in Admin Area
1 parent ba5e160 commit 349e13d

3 files changed

Lines changed: 5 additions & 2 deletions

File tree

client/web/admin/src/components/Role/CRoleEditorInfo.vue

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,9 @@ export default {
229229
},
230230
231231
set (isContext) {
232+
this.role.meta.context.resourceTypes = []
233+
this.role.meta.context.expr = ''
234+
232235
this.$emit('update:is-context', isContext)
233236
},
234237
},

client/web/admin/src/views/System/Role/Editor.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ export default {
236236
237237
if (this.roleID) {
238238
this.$SystemAPI.roleUpdate(role)
239-
.then(role => {
239+
.then(() => {
240240
this.fetchRole()
241241
242242
this.animateSuccess('info')

lib/js/src/system/types/role.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ export class Role {
9898
}
9999

100100
get isContext (): boolean {
101-
return this.meta?.context?.expr?.length > 0
101+
return this.meta?.context?.expr?.length > 0 || this.meta?.context?.resourceTypes?.length > 0
102102
}
103103

104104
clone (): Role {

0 commit comments

Comments
 (0)