Fixed role entity permissions ignoring inheritance

[bookstack] / resources / js / components / entity-permissions.js

diff --git a/resources/js/components/entity-permissions.js b/resources/js/components/entity-permissions.js
index a18fc7a97aedbceb8e913baf8b25f6fe0e48f4df..d4a616ff1d5765e2f278028016e8fa95bf1d8cbc 100644 (file)
--- a/resources/js/components/entity-permissions.js
+++ b/resources/js/components/entity-permissions.js
@@ -1,7 +1,7 @@
-/**
- * @extends {Component}
- */
-class EntityPermissions {
+import {htmlToDom} from "../services/dom";
+import {Component} from "./component";
+
+export class EntityPermissions extends Component {

 
     setup() {
         this.container = this.$el;
 
     setup() {
         this.container = this.$el;


@@ -18,7 +18,7 @@ class EntityPermissions {
         // "Everyone Else" inherit toggle
         this.everyoneInheritToggle.addEventListener('change', event => {
             const inherit = event.target.checked;
         // "Everyone Else" inherit toggle
         this.everyoneInheritToggle.addEventListener('change', event => {
             const inherit = event.target.checked;

-            const permissions = document.querySelectorAll('input[type="checkbox"][name^="restrictions[0]["]');
+            const permissions = document.querySelectorAll('input[name^="permissions[0]["]');

             for (const permission of permissions) {
                 permission.disabled = inherit;
                 permission.checked = false;
             for (const permission of permissions) {
                 permission.disabled = inherit;
                 permission.checked = false;


@@ -53,17 +53,14 @@ class EntityPermissions {
 
         // Get and insert new row
         const resp = await window.$http.get(`/permissions/form-row/${this.entityType}/${roleId}`);
 
         // Get and insert new row
         const resp = await window.$http.get(`/permissions/form-row/${this.entityType}/${roleId}`);

-        const wrap = document.createElement('div');
-        wrap.innerHTML = resp.data;
-        const row = wrap.children[0];
+        const row = htmlToDom(resp.data);

         this.roleContainer.append(row);
         this.roleContainer.append(row);

-        window.components.init(row);

 
         this.roleSelect.disabled = false;
     }
 
     removeRowOnButtonClick(button) {
 
         this.roleSelect.disabled = false;
     }
 
     removeRowOnButtonClick(button) {

-        const row = button.closest('.content-permissions-row');
+        const row = button.closest('.item-list-row');

         const roleId = button.dataset.roleId;
         const roleName = button.dataset.roleName;
 
         const roleId = button.dataset.roleId;
         const roleName = button.dataset.roleName;
 


@@ -75,6 +72,4 @@ class EntityPermissions {
         row.remove();
     }
 
         row.remove();
     }
 

-}
-
-export default EntityPermissions;
\ No newline at end of file
+}
\ No newline at end of file