Fix contextual role editing in Admin Area

cortezaproject · Dec 2, 2024 · 483e934 · 483e934
1 parent 9f3c500
commit 483e934
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/client/web/admin/src/components/Role/CRoleEditorInfo.vue b/client/web/admin/src/components/Role/CRoleEditorInfo.vue
@@ -229,6 +229,9 @@ export default {
       },
 
       set (isContext) {
+        this.role.meta.context.resourceTypes = []
+        this.role.meta.context.expr = ''
+
         this.$emit('update:is-context', isContext)
       },
     },

diff --git a/client/web/admin/src/views/System/Role/Editor.vue b/client/web/admin/src/views/System/Role/Editor.vue
@@ -236,7 +236,7 @@ export default {
 
       if (this.roleID) {
         this.$SystemAPI.roleUpdate(role)
-          .then(role => {
+          .then(() => {
             this.fetchRole()
 
             this.animateSuccess('info')

diff --git a/lib/js/src/system/types/role.ts b/lib/js/src/system/types/role.ts
@@ -98,7 +98,7 @@ export class Role {
   }
 
   get isContext (): boolean {
-    return this.meta?.context?.expr?.length > 0
+    return this.meta?.context?.expr?.length > 0 || this.meta?.context?.resourceTypes?.length > 0
   }
 
   clone (): Role {