Merge pull request #3707 from AtlasOfLivingAustralia/feature/issue3704_2

temi · web-flow · commit ba91e1f8d90b · 2026-03-05T13:35:20.000+11:00
Render MU site separately to MU to avoid issues with JSONObject rende…
diff --git a/grails-app/controllers/au/org/ala/merit/ManagementUnitController.groovy b/grails-app/controllers/au/org/ala/merit/ManagementUnitController.groovy
@@ -51,17 +51,16 @@ class ManagementUnitController {
                 isManagementUnitStarredByUser = userService.isManagementUnitStarredByUser(user?.userId, mu?.managementUnitId)?.isManagementUnitStarredByUser
             }
 
-            def mapFeatures = mu.managementUnitSiteId?siteService.getSiteGeoJson(mu.managementUnitSiteId) : null
-            if (mapFeatures)
-                mu.mapFeatures = mapFeatures
+            def muExtent = mu.managementUnitSiteId?siteService.getSiteGeoJson(mu.managementUnitSiteId) : null
 
             [managementUnit     : mu,
              roles              : roles,
              user               : user,
              isAdmin            : user?.isAdmin,
              isGrantManager     : user?.isGrantManager,
              content            : content(mu, user),
-             isManagementUnitStarredByUser: isManagementUnitStarredByUser
+             isManagementUnitStarredByUser: isManagementUnitStarredByUser,
+             muExtent:muExtent
              ]
         }
     }
diff --git a/grails-app/views/managementUnit/index.gsp b/grails-app/views/managementUnit/index.gsp
@@ -112,6 +112,8 @@
 
     $(function () {
         var managementUnit =<fc:modelAsJavascript model="${managementUnit}"/>;
+        var muExtent = <fc:modelAsJavascript model="${managementUnitExtent}" default="null"/>;
+        managementUnit.mapFeatures = muExtent;
         var config = _.extend({reportingConfigSelector:'#reporting form'}, fcConfig);
         var managementUnitViewModel = new ManagementUnitPageViewModel(managementUnit, config);
 
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -12,7 +12,7 @@
   },
   "devDependencies": {
     "@metahub/karma-jasmine-jquery": "^2.0.1",
-    "chromedriver": "^143.0.4",
+    "chromedriver": "^145.0.6",
     "jasmine-core": "^3.5.0",
     "jasmine-jquery": "^2.0.0",
     "jquery": "3.6.2",

Original file line number	Diff line number	Diff line change
`@@ -51,17 +51,16 @@ class ManagementUnitController {`
`51`	`51`	`isManagementUnitStarredByUser = userService.isManagementUnitStarredByUser(user?.userId, mu?.managementUnitId)?.isManagementUnitStarredByUser`
`52`	`52`	`}`
`53`	`53`
`54`		`- def mapFeatures = mu.managementUnitSiteId?siteService.getSiteGeoJson(mu.managementUnitSiteId) : null`
`55`		`- if (mapFeatures)`
`56`		`- mu.mapFeatures = mapFeatures`
	`54`	`+ def muExtent = mu.managementUnitSiteId?siteService.getSiteGeoJson(mu.managementUnitSiteId) : null`
`57`	`55`
`58`	`56`	`[managementUnit : mu,`
`59`	`57`	`roles : roles,`
`60`	`58`	`user : user,`
`61`	`59`	`isAdmin : user?.isAdmin,`
`62`	`60`	`isGrantManager : user?.isGrantManager,`
`63`	`61`	`content : content(mu, user),`
`64`		`- isManagementUnitStarredByUser: isManagementUnitStarredByUser`
	`62`	`+ isManagementUnitStarredByUser: isManagementUnitStarredByUser,`
	`63`	`+ muExtent:muExtent`
`65`	`64`	`]`
`66`	`65`	`}`
`67`	`66`	`}`