Merge branch 'master' into DHIS2-9300/sql-view-current-id

dhis2 · Aug 26, 2024 · bba6229 · bba6229
2 parents 72ba75c + 67c7d27
commit bba6229
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [32.31.7](https://github.com/dhis2/maintenance-app/compare/v32.31.6...v32.31.7) (2024-08-26)
+
+
+### Bug Fixes
+
+* **coc:** Add ignoreApproval back ([#2912](https://github.com/dhis2/maintenance-app/issues/2912)) ([d4cd22f](https://github.com/dhis2/maintenance-app/commit/d4cd22ff903c82f6b543c79f89347072b72c4d6b))
+
 ## [32.31.6](https://github.com/dhis2/maintenance-app/compare/v32.31.5...v32.31.6) (2024-08-25)
 
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "maintenance-app",
-  "version": "32.31.6",
+  "version": "32.31.7",
   "description": "DHIS2 Maintenance app",
   "repository": {
     "type": "git",

diff --git a/src/config/field-config/field-order.js b/src/config/field-config/field-order.js
@@ -56,6 +56,7 @@ const fieldOrderByName = new Map([
     ['categoryOptionCombo', [
         'name',
         'code',
+        'ignoreApproval',
     ]],
     ['categoryCombo', [
         'name',

diff --git a/src/i18n/i18n_module_en.properties b/src/i18n/i18n_module_en.properties
@@ -227,6 +227,7 @@ approve_data=Approve data
 decimals_in_data_output=Decimals in data output
 categories=Categories
 ignore_data_approval=Ignore data approval
+ignore_approval=Ignore approval
 data_dimension_type=Data dimension type
 indicator_type=Indicator type
 indicator_group_set_management=Indicator group set management
-Original file line number
+Diff line change
@@ Expand Up / @@ -56,6 +56,7 @@ const fieldOrderByName = new Map([ @@
         ['categoryOptionCombo', [
             'name',
             'code',
+            'ignoreApproval',
         ]],
         ['categoryCombo', [
             'name',
@@ Expand Down @@