Merge branch '2023.11' into 2024.11

ci/gitlab-ci/custom_merge_jobs.yml

@@ -3,21 +3,12 @@ merge_be:
   stage: merge2
   extends: .abstract.merge
   script:
-    ### 2021.11 (TODO remove in 2022/11)
-    - merge_merge_upwards 2020.11 tine20.com/2020.11-custom
-    - merge_merge_upwards tine20.com/2020.11-custom tine20.com/2020.11
-    ### 2021.11
-    - merge_merge_upwards tine20.com/2020.11-custom tine20.com/2021.11-custom
-    - merge_merge_upwards 2021.11 tine20.com/2021.11-custom
-    - merge_merge_upwards tine20.com/2021.11-custom tine20.com/2021.11
     ### 2022.11
     - merge_merge_upwards tine20.com/2021.11-custom tine20.com/2022.11-custom
     - merge_merge_upwards 2022.11 tine20.com/2022.11-custom
     - merge_merge_upwards tine20.com/2022.11-custom tine20.com/2022.11
     ### saas
-    - merge_merge_upwards 2022.11 saas/2022.11-custom
-    - merge_merge_upwards tine20.com/2022.11-custom saas/2022.11
-    - merge_merge_upwards saas/2022.11-custom saas/2022.11
+    - merge_merge_upwards 2023.11 saas/2023.11
     - merge_trigger_next
   rules:
     - if: $AUTO_MERGE_BE == "true"

tine20/Addressbook/js/ContactPropertiesGrid.js

@@ -88,9 +88,13 @@ export default (config) => {
     });
 
     const onRecordLoad = (editDialog, record) => {
+        const recordGrants = _.get(record, record.constructor.getMeta('grantsPath'));
         propertyGrid.setSource(config.fields.reduce((source, field, idx) => {
-            const name = `${_.padStart( String(idx), 3, '0')}_${field.fieldName}`;
-            source[name] = record.get(field.fieldName);
+            const requiredGrants = field.requiredGrants; // NOTE: at the moment this means rw!
+            if (! requiredGrants || recordGrants.adminGrant || requiredGrants.some((requiredGrant) => { return recordGrants[requiredGrant] })) {
+                const name = `${_.padStart(String(idx), 3, '0')}_${field.fieldName}`;
+                source[name] = record.get(field.fieldName);
+            }
             return source;
         }, {}));