Merge remote-tracking branch 'origin/dev' into feature/issue3369

AtlasOfLivingAustralia · Dec 10, 2024 · 6342fc9 · 6342fc9
2 parents 952f90b + 67f3d6f
commit 6342fc9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/grails-app/controllers/au/org/ala/merit/ProjectController.groovy b/grails-app/controllers/au/org/ala/merit/ProjectController.groovy
@@ -226,7 +226,8 @@ class ProjectController {
             model.details.meriPlanTemplate = config.meriPlanTemplate ? config.meriPlanTemplate+"View" : RLP_MERI_PLAN_TEMPLATE+'View'
 
             boolean serviceDeliveryVisible = model.dashboard.visible && userHasViewAccess
-            model.serviceDelivery = [label: 'Dashboard', visible: serviceDeliveryVisible, type: 'tab', template: 'rlpServiceDashboard', includeInvoiced:config.supportsOutcomeTargets()]
+            boolean showDashboardInvoiceField = (config.showsDashboardInvoiceField == null) ? config.supportsOutcomeTargets() : config.showsDashboardInvoiceField
+            model.serviceDelivery = [label: 'Dashboard', visible: serviceDeliveryVisible, type: 'tab', template: 'rlpServiceDashboard', includeInvoiced:showDashboardInvoiceField]
             if (model.serviceDelivery.visible) {
                 // This can be a slow call so don't make it if the data won't be displayed
                 model.serviceDelivery.servicesDashboard = projectService.getServiceDashboardData(project.projectId, false)

diff --git a/src/main/groovy/au/org/ala/merit/config/ProgramConfig.groovy b/src/main/groovy/au/org/ala/merit/config/ProgramConfig.groovy
@@ -151,6 +151,9 @@ class ProgramConfig implements Map {
         template != null
     }
 
+    /** This flag controls whether the invoice field in the dashboard is shown */
+    boolean showsDashboardInvoiceField = true
+
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -151,6 +151,9 @@ class ProgramConfig implements Map { @@
             template != null
         }
+        /** This flag controls whether the invoice field in the dashboard is shown */
+        boolean showsDashboardInvoiceField = true
     }
@@ Expand Down @@