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

grails-app/assets/javascripts/sites.js

@@ -386,6 +386,9 @@ var PidLocation = function (l) {
                     url: fcConfig.featuresService + '?layerId=' +self.chosenLayer(),
                     dataType:'json'
                 }).done(function(data) {
+                    data = _.sortBy(data, function(item) {
+                        return item && item.name;
+                    });
                     self.layerObjects(data);
                     // During initialisation of the object list, any existing value for the chosen layer will have
                     // been set to undefined because it can't match a value in the list.
@@ -415,7 +418,7 @@ var PidLocation = function (l) {
     if (l.fid == USER_UPLOAD_FID) {
         self.layers().push({id:USER_UPLOAD_FID, name:'User Uploaded'});
     }
-    else if ($.inArray(l.fid,OLD_NRM_LAYER_FIDS)) {
+    else if (_.contains(OLD_NRM_LAYER_FIDS, l.fid)) {
         self.layers().push({id: l.fid, name:'NRM Regions - pre 2023'});
     }
 

src/main/scripts/releases/3.4/addOrganisationToActivity.js

@@ -0,0 +1,14 @@
+load('../../utils/audit.js');
+const adminUserId = 'system';
+
+let reports = db.report.find({status: {$ne: 'deleted'}, organisationId: {$exists: true}, category:'Regional Capacity Services Reporting'});
+while (reports.hasNext()) {
+    let report = reports.next();
+    let activities = db.activity.find({activityId:report.activityId, type:'Regional Capacity Services Report'});
+    while (activities.hasNext()) {
+        let activity = activities.next();
+        activity.organisationId = report.organisationId;
+        db.activity.replaceOne({activityId:activity.activityId}, activity);
+        audit(activity, activity.activityId, 'au.org.ala.ecodata.Activity', adminUserId, activity.organisationId);
+    }
+}