Merge pull request #2153 from SEED-platform/2105_edit_record_warning_…

…update Edit record matching warning updated to be less overwhelming initially
SEED-platform · Mar 24, 2020 · 2024b9a · 2024b9a
2 parents 4b3f35b + 66c1d51
commit 2024b9a
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 11 deletions.
diff --git a/seed/static/seed/js/controllers/inventory_detail_controller.js b/seed/static/seed/js/controllers/inventory_detail_controller.js
@@ -592,8 +592,8 @@ angular.module('BE.seed.controller.inventory_detail', [])
                 };
               } else if (trigger === 'edit') {
                 return {
-                  properties: 'Updating this property will merge & link any matching properties.',
-                  taxlots: 'Updating this tax lot will merge & link any matching tax lots.'
+                  properties: 'Updating this property will trigger a matching round for this record.',
+                  taxlots: 'Updating this tax lot will trigger a matching round for this record.'
                 };
               }
             }

diff --git a/seed/static/seed/js/controllers/record_match_merge_link_modal_controller.js b/seed/static/seed/js/controllers/record_match_merge_link_modal_controller.js
@@ -31,6 +31,16 @@ angular.module('BE.seed.controller.record_match_merge_link_modal', [])
         $scope.table_name = 'TaxLotState';
       }
 
+      $scope.helpBtnText = 'Expand Help';
+
+      $scope.changeHelpBtnText = function(helpBtnText) {
+        if(helpBtnText === 'Collapse Help'){
+          $scope.helpBtnText = 'Expand Help' ;
+        } else {
+          $scope.helpBtnText = 'Collapse Help';
+        }
+      };
+
       promises = [
         organization_service.matching_criteria_columns(organization_id),
       ];

diff --git a/seed/static/seed/partials/record_match_merge_link_modal.html b/seed/static/seed/partials/record_match_merge_link_modal.html
@@ -2,18 +2,28 @@
     <h4 ng-if="::inventory_type === 'properties'" class="modal-title">{$:: headers.properties | translate $}</h4>
     <h4 ng-if="::inventory_type === 'taxlots'" class="modal-title">{$:: headers.taxlots | translate $}</h4>
 </div>
+
 <div class="modal-body row">
-    <div class="col-sm-12" translate>MERGE_IN_CYCLE_MATCHES</div>
-    <div class="col-sm-12" translate>LINK_OUT_CYCLE_MATCHES</div>
-    <div class="col-sm-12" translate>MERGE_MULTIPLE_IN_CYCLE_MATCHES</div>
+    <div class="col-sm-12">
+        <button type="button" class="btn btn-primary" data-toggle="collapse" data-target="#help-text" ng-click=changeHelpBtnText(helpBtnText)>{$ helpBtnText $}</button>
+    </div>
 </div>
-<div class="modal-body row">
-    <div class="col-sm-12" translate>LISTING_ORG_MATCHING_CRITERIA</div>
-    <ul>
-      <li ng-repeat="col_name in matching_criteria_columns">{$:: col_name $}</li>
-    </ul>
+
+<div class="collapse" id="help-text">
+    <div class="modal-body row">
+        <div class="col-sm-12" translate>MERGE_IN_CYCLE_MATCHES</div>
+        <div class="col-sm-12" translate>LINK_OUT_CYCLE_MATCHES</div>
+        <div class="col-sm-12" translate>MERGE_MULTIPLE_IN_CYCLE_MATCHES</div>
+    </div>
+    <div class="modal-body row">
+        <div class="col-sm-12" translate>LISTING_ORG_MATCHING_CRITERIA</div>
+        <ul>
+          <li ng-repeat="col_name in matching_criteria_columns">{$:: col_name $}</li>
+        </ul>
+    </div>
 </div>
-<div class="modal-body row">
+
+<div class="modal-body row" style="padding-top: 0px;">
     <div class="col-sm-12" translate>CONTINUE_QUESTION</div>
 </div>
 <div class="modal-footer">