Merge branch 'pu/cw/modelGrantNames' into '2024.11'

tweak(Tinebase): allow generic model dependend grant names See merge request tine20/tine20!4874
tine-groupware · Feb 1, 2024 · e974738 · e974738
2 parents a47aea6 + 3059eae
commit e974738
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/tine20/Tinebase/js/widgets/ActionUpdater.js b/tine20/Tinebase/js/widgets/ActionUpdater.js
@@ -230,6 +230,7 @@
     getGrantsSum: function(records) {
 
         var _ = window.lodash,
+            modelNamePrefix = this.recordClass?.getMeta('modelName') + '_',
             defaultGrant = records.length == 0 ? false : true,
             grants = {
                 addGrant:       defaultGrant,
@@ -244,6 +245,7 @@
         if (! this.evalGrants) {
             return grants;
         }
+
 
         var recordGrants;
         for (var i=0; i<records.length; i++) {
@@ -254,7 +256,8 @@
             }
 
             for (var grant in grants) {
-                grants[grant] = _.get(grants, grant, false) && _.get(recordGrants, grant, false);
+                // e.g. readGrant || Document_Invoice_readGrant
+                grants[grant] = _.get(grants, grant, false) && (_.get(recordGrants, grant, false) || _.get(recordGrants, modelNamePrefix+grant, false));
             }
 
             // custom grants model
@@ -264,7 +267,7 @@
             }
         }
         // if calculated admin right is true, overwrite all grants with true
-        if(grants.adminGrant) {
+        if(grants.adminGrant || grants[modelNamePrefix + 'adminGrant']) {
             for (var grant in grants) {
                 grants[grant] = true;
             }