CIWEMB-435: Allow having two custom fields with the same name

compucorp · Nov 9, 2023 · e21ceb4 · e21ceb4
1 parent ed36ea8
commit e21ceb4
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/ang/civiawards/reviews-tab/directives/reviews-case-tab-content.directive.js b/ang/civiawards/reviews-tab/directives/reviews-case-tab-content.directive.js
@@ -120,8 +120,15 @@
 
       return _.map(angular.copy(activitiesData), function (activity) {
         var applicantReviewFields = {};
-        activity['api.CustomValue.gettreevalues'].values.map(function (field) {
-          applicantReviewFields = Object.assign(applicantReviewFields, field.fields);
+        activity['api.CustomValue.gettreevalues'].values.map(function (fieldSet) {
+          Object.keys(fieldSet.fields).forEach(function (key) {
+            var field = fieldSet.fields[key];
+            var newKey = key + field.id;
+            fieldSet.fields[newKey] = Object.assign({ id: field.id }, field);
+            delete fieldSet.fields[key];
+          });
+
+          applicantReviewFields = Object.assign(applicantReviewFields, fieldSet.fields);
         });
 
         activity.status_label = activity['api.OptionValue.getsingle'].label;