SEED-platform · kflemin · Mar 11, 2026 · Dec 18, 2025 · Mar 10, 2026 · Mar 10, 2026
diff --git a/locale/en_US/LC_MESSAGES/django.mo b/locale/en_US/LC_MESSAGES/django.mo
diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po
@@ -1,15 +1,14 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-06 12:15-0700\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: lokalise.com\n"
+"Project-Id-Version: SEED Platform\n"
+"PO-Revision-Date: 2026-03-10 20:51\n"
+"Last-Translator: lokalise.com\n"
+"Language-Team: lokalise.com\n\n"
+"Language: en_US\n"
 
 msgid "# Of Files"
 msgstr "# Of Files"
@@ -2948,7 +2947,7 @@ msgid "ORGANIZATION_WUI_DISPLAY_UNITS"
 msgstr "Measurement unit display for Water Use Intensity (WUI)"
 
 msgid "ORG_MATCH_MERGE_LINK_WARNING"
-msgstr "WARNING: You have modified the criteria that your organization's data will be matched and merged against. Once a column has been added to an organization's matching criteria it cannot be removed while the organization has inventory."
+msgstr "WARNING: You have modified the criteria that your organization's data will be matched and merged against. If the organization is using more than one access levels: once a column has been added to an organization's matching criteria it cannot be removed while the organization has inventory. Matching criteria can be removed in organizations not using access levels."
 
 msgid "OVERWRITE_COLUMN_DATA_QUESTION"
 msgstr "Overwrite data?"

diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo
diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
@@ -5,7 +5,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: lokalise.com\n"
 "Project-Id-Version: SEED Platform\n"
-"PO-Revision-Date: 2025-12-11 17:45\n"
+"PO-Revision-Date: 2026-03-10 20:51\n"
 "Last-Translator: lokalise.com\n"
 "Language-Team: lokalise.com\n\n"
 "Language: es\n"
@@ -3751,9 +3751,8 @@ msgstr "Visualización de la unidad de medida del consumo de agua"
 msgid "ORGANIZATION_WUI_DISPLAY_UNITS"
 msgstr "Visualización de la unidad de medida para la intensidad de uso del agua (WUI)"
 
-#, fuzzy
 msgid "ORG_MATCH_MERGE_LINK_WARNING"
-msgstr "ADVERTENCIA: Ha modificado los criterios con los que se compararán y combinarán los datos de su organización. Una vez que se ha añadido una columna a los criterios de correspondencia de una organización, no se puede eliminar mientras la organización tenga inventario."
+msgstr "ADVERTENCIA: Ha modificado los criterios con los que se compararán y fusionarán los datos de su organización. Si la organización utiliza más de un nivel de acceso, una vez que se haya añadido una columna a los criterios de coincidencia de una organización, no se podrá eliminar mientras la organización tenga inventario. Los criterios de coincidencia se pueden eliminar en organizaciones que no utilicen niveles de acceso."
 
 #, fuzzy
 msgid "OVERWRITE_COLUMN_DATA_QUESTION"

diff --git a/locale/fr_CA/LC_MESSAGES/django.mo b/locale/fr_CA/LC_MESSAGES/django.mo
diff --git a/locale/fr_CA/LC_MESSAGES/django.po b/locale/fr_CA/LC_MESSAGES/django.po
@@ -1,15 +1,14 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-04 14:26-0700\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: lokalise.com\n"
+"Project-Id-Version: SEED Platform\n"
+"PO-Revision-Date: 2026-03-10 20:51\n"
+"Last-Translator: lokalise.com\n"
+"Language-Team: lokalise.com\n\n"
+"Language: fr_CA\n"
 
 msgid "# Of Files"
 msgstr "Nombre de fichiers"
@@ -2970,7 +2969,7 @@ msgid "ORGANIZATION_WUI_DISPLAY_UNITS"
 msgstr "Affichage de l'unité de mesure de l'intensité d'utilisation de l'eau (WUI)"
 
 msgid "ORG_MATCH_MERGE_LINK_WARNING"
-msgstr "AVERTISSEMENT: Vous avez modifié les critères selon lesquels les données de votre organisation seront mises en correspondance et fusionnées. Une fois qu'une colonne a été ajoutée aux critères de correspondance d'une organisation, elle ne peut pas être supprimée tant que l'organisation dispose d'un inventaire."
+msgstr "AVERTISSEMENT: Vous avez modifié les critères de correspondance et de fusion des données de votre organisation. Si l’organisation utilise plusieurs niveaux d’accès: une fois qu’une colonne a été ajoutée aux critères de correspondance, elle ne peut plus être supprimée tant que l’organisation dispose de stocks. Les critères de correspondance peuvent être supprimés dans les organisations n’utilisant pas de niveaux d’accès."
 
 msgid "OVERWRITE_COLUMN_DATA_QUESTION"
 msgstr "Écraser les données?"

diff --git a/seed/static/seed/js/controllers/column_settings_controller.js b/seed/static/seed/js/controllers/column_settings_controller.js
@@ -15,6 +15,8 @@
   'auth_payload',
   'columns_service',
   'modified_service',
+  'organization_service',
+  'uploader_service',
   'spinner_utility',
   'urls',
   'naturalSort',
@@ -33,6 +35,8 @@
     auth_payload,
     columns_service,
     modified_service,
+    organization_service,
+    uploader_service,
     spinner_utility,
     urls,
     naturalSort,
@@ -125,7 +129,7 @@
 
     $scope.matching_status = (column) => {
       if (column.is_extra_data) return 'ineligible';
-      if ($scope.org.inventory_count && initial_matching_ids.includes(column.id)) return 'locked';
+      if ($scope.org.access_level_names.length > 1 && $scope.org.inventory_count && initial_matching_ids.includes(column.id)) return 'locked';
       return 'eligible';
     };
 
@@ -249,6 +253,30 @@
 
     $scope.isModified = () => modified_service.isModified();
 
+    $scope.complete_column_update = function () {
+      const matching_criteria_changed = _.find(_.values(diff), (delta) => _.has(delta, 'is_matching_criteria'));
+
+      if (matching_criteria_changed) {
+        // reset the spinner and run whole org match merge link
+        spinner_utility.show(undefined, $('.display')[0]);
+
+        organization_service.match_merge_link($scope.org.id, $scope.inventory_type).then((response) => {
+          uploader_service.check_progress_loop(
+            response.progress_key,
+            0,
+            1,
+            (response) => {
+              organization_service.get_match_merge_link_result($scope.org.id, response.unique_id).then(() => column_update_complete());
+            },
+            () => {},
+            { progress: 0 }
+          );
+        });
+      } else {
+        column_update_complete();
+      }
+    };
+
     // Table Sorting
     const default_sort_toggle = () => {
       $scope.column_sort = 'default';
@@ -360,6 +388,7 @@
       }
 
       modified_service.resetModified();
+      $scope.modal_instance.dismiss();
       $state.reload();
     };
 
@@ -378,14 +407,7 @@
         return;
       }
 
-      const modal_instance = $scope.open_confirm_column_settings_modal();
-      modal_instance.result
-        .then((data) => {
-          column_update_complete(data);
-        })
-        .catch(() => {
-          // User cancelled
-        });
+      $scope.modal_instance = $scope.open_confirm_column_settings_modal();
     };
 
     $scope.open_create_column_modal = () => $uibModal.open({
@@ -412,7 +434,8 @@
         columns_service: () => columns_service,
         spinner_utility: () => spinner_utility,
         table_name: () => ($scope.inventory_type === 'properties' ? 'PropertyState' : 'TaxLotState'),
-        $q: () => $q
+        $q: () => $q,
+        complete_column_update: () => $scope.complete_column_update
       }
     });