From 207d29a1094a78f4f220fe497164358e514b9b07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cornelius=20Wei=C3=9F?= Date: Tue, 6 Feb 2024 12:21:52 +0100 Subject: [PATCH 1/2] fix(Addressbook) don't show fields user has no privateGrant for --- tine20/Addressbook/js/ContactPropertiesGrid.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tine20/Addressbook/js/ContactPropertiesGrid.js b/tine20/Addressbook/js/ContactPropertiesGrid.js index ce424927787..3562161a94f 100644 --- a/tine20/Addressbook/js/ContactPropertiesGrid.js +++ b/tine20/Addressbook/js/ContactPropertiesGrid.js @@ -63,9 +63,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; }, {})); From 2efaf966141821bb825c4cdecd3d2b1726ef65d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Sch=C3=BCle?= Date: Tue, 6 Feb 2024 15:16:30 +0100 Subject: [PATCH 2/2] conf(ci/merge): update saas to 2023.11 --- ci/gitlab-ci/custom_merge_jobs.yml | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/ci/gitlab-ci/custom_merge_jobs.yml b/ci/gitlab-ci/custom_merge_jobs.yml index c64a5521636..7db0d2a8fb5 100644 --- a/ci/gitlab-ci/custom_merge_jobs.yml +++ b/ci/gitlab-ci/custom_merge_jobs.yml @@ -3,21 +3,12 @@ merge_be: stage: merge2 extends: .abstract.merge script: - ### 2021.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"