Merge branch 'dev' into feature/issue192

Author: chrisala

grails-app/controllers/au/org/ala/merit/ActivityController.groovy

@@ -241,8 +241,7 @@ class ActivityController {
         def model = [activity: activity, returnTo: buildReturnToUrl(activity, params.returnTo, false), create: true]
         model.project = projectId ? projectService.get(projectId) : null
 
-        ProgramConfig config = projectConfigurationService.getProjectConfiguration(model.project)
-        model.activityTypes = (config.activities) ? config.activities : metadataService.activityTypesList(model.project?.associatedProgram, model.project?.associatedSubProgram)
+        model.activityTypes = metadataService.activityTypesList(model.project?.associatedProgram, model.project?.associatedSubProgram)
 
         model.site = siteId ? siteService.get(siteId) : null
         if (projectId) {

package-lock.json

@@ -11,7 +11,7 @@
   },
   "devDependencies": {
     "@metahub/karma-jasmine-jquery": "^2.0.1",
-    "chromedriver": "111.0.0",
+    "chromedriver": "113.0.0",
     "jasmine-core": "^3.5.0",
     "jasmine-jquery": "^2.0.0",
     "jquery": "3.6",

package.json

@@ -16,6 +16,7 @@ var config = {
     ],
     excludes:["DATA_SETS"],
     "projectTemplate": "default",
+    "meriPlanTemplate": "meriPlan",
     "activities": [],
     "activityNavigationMode": "returnToProject"
 };

src/main/scripts/releases/2.11/legacy/addBiodiversityFundProgramToDatabase.js

@@ -95,6 +95,7 @@ var config = {
     ],
     excludes:["DATA_SETS","RISKS_AND_THREATS"],
     "projectTemplate": "default",
+    "meriPlanTemplate": "meriPlan",
     "activities": [
         {name:"Reef 2050 Plan Action Reporting"}
     ],