Merge branch 'master' into develop

AtlasOfLivingAustralia · Nov 23, 2023 · 36c75f7 · 36c75f7
2 parents b6a05f3 + 2007d80
commit 36c75f7
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 10 deletions.
diff --git a/build.gradle b/build.gradle
@@ -40,7 +40,7 @@ apply from: "${project.projectDir}/gradle/publish.gradle"
 repositories {
     mavenLocal()
     //for missing jai_core.jar
-   //maven { url "https://mvnrepository.com" }
+    //maven { url "https://mvnrepository.com" }
     maven { url "https://repo.osgeo.org/repository/release/" }
     maven { url "https://repo.grails.org/grails/core" }
     maven { url = uri("https://maven.pkg.github.com/atlasoflivingaustralia/ecodata-client-plugin")

diff --git a/grails-app/assets/javascripts/project-finder.js b/grails-app/assets/javascripts/project-finder.js
@@ -565,7 +565,7 @@ function ProjectFinder(config) {
 
         // Results view
         var savedViewMode = amplify.store('pt-view-state');
-        savedViewMode = savedViewMode || "#grid-tab"; //Default is the new map-popup view
+        savedViewMode = savedViewMode || "grid-tab"; //Default is the new map-popup view
         $('.project-finder-tab a#'+savedViewMode).tab('show');
 
         // Filters view

diff --git a/grails-app/assets/vendor/jquery-ui/1.13.0/jquery-ui.structure.css b/grails-app/assets/vendor/jquery-ui/1.13.0/jquery-ui.structure.css
@@ -53,7 +53,7 @@
 }
 
 .ui-front {
-	z-index: 100;
+	z-index: 2000;
 }
 
 

diff --git a/grails-app/views/bioActivity/_createEditActivityBody.gsp b/grails-app/views/bioActivity/_createEditActivityBody.gsp
@@ -259,10 +259,10 @@
 
 <g:each in="${metaModel?.outputs}" var="outputName">
     <g:if test="${outputName != 'Photo Points'}">
-        <g:set var="blockId" value="${fc.toSingleWord([name: outputName])}"/>
+        <g:set var="blockId" value="${raw(fc.toSingleWord([name: outputName]))}"/>
         var viewModelName = "${blockId}ViewModel",
             elementId = "ko${blockId}",
-            outputName = "${outputName}";
+            outputName = "${raw(outputName)}";
 
         var output = $.grep(activity.outputs || [], function(it){return it.name == outputName})[0] || { name: outputName};
         var config = $.grep(metaModel.outputConfig || [], function(it){return it.outputName == outputName})[0] || {};

diff --git a/grails-app/views/bioActivity/index.gsp b/grails-app/views/bioActivity/index.gsp
@@ -127,7 +127,7 @@
 
     <!-- ko stopBinding:true -->
         <g:each in="${metaModel?.outputs}" var="outputName">
-            <g:set var="blockId" value="${fc.toSingleWord([name: outputName])}"/>
+            <g:set var="blockId" value="${raw(fc.toSingleWord([name: outputName]))}"/>
             <g:set var="model" value="${outputModels[outputName]}"/>
             <g:set var="output" value="${activity.outputs.find { it.name == outputName }}"/>
             <g:if test="${!output}">
@@ -148,7 +148,7 @@
                     $(function(){
                         var viewModelName = "${blockId}ViewModel",
                             elementId = "ko${blockId}",
-                            outputName = "${outputName}",
+                            outputName = "${raw(outputName)}",
                             viewModelInstance = viewModelName + "Instance";
 
                         var output = $.grep(activity.outputs || [], function(it){return it.name == outputName})[0] || { name: outputName};

diff --git a/grails-app/views/layouts/mobile.gsp b/grails-app/views/layouts/mobile.gsp
@@ -60,8 +60,8 @@
             withCredentials: true
         },
         beforeSend: function (xhr) {
-            <g:if test="${authorization}">
-                xhr.setRequestHeader('Authorization', "${raw(authorization)}");
+            <g:if test="${Authorization}">
+                xhr.setRequestHeader('Authorization', "${raw(Authorization)}");
             </g:if>
             <g:elseif test="${grailsApplication.config.getProperty("mobile.authKeyEnabled", Boolean) && authKey && userName}">
                 xhr.setRequestHeader('authKey', "${raw(authKey)}");

diff --git a/grails-app/views/project/projectFinder.gsp b/grails-app/views/project/projectFinder.gsp
@@ -72,7 +72,7 @@
             isUserPage: true,
             hideWorldWideBtn: true,
             isCitizenScience: false,
-            showAllProjects: true
+            showAllProjects: true,
         </g:if>
         <g:else>
             <g:if test="${isEcoScience}">

diff --git a/karma.conf.js b/karma.conf.js
@@ -39,9 +39,11 @@ module.exports = function (config) {
             'node_modules/leaflet/dist/leaflet.js',
             'grails-app/assets/vendor/leaflet-plugins-2.0.0/layer/tile/Google.js',
             'grails-app/assets/javascripts/MapUtilities.js',
+            'https://cdn.jsdelivr.net/gh/AtlasOfLivingAustralia/ecodata-client-plugin/grails-app/assets/vendor/expr-eval/2.0.2/bundle.js',
             'https://cdn.jsdelivr.net/gh/AtlasOfLivingAustralia/ecodata-client-plugin/grails-app/assets/vendor/select2/4.0.3/js/select2.full.js',
             'https://cdn.jsdelivr.net/gh/AtlasOfLivingAustralia/ecodata-client-plugin/grails-app/assets/vendor/typeahead/0.11.1/bloodhound.js',
             'https://cdn.jsdelivr.net/gh/AtlasOfLivingAustralia/ecodata-client-plugin/grails-app/assets/vendor/expr-eval/2.0.2/bundle.js',
+            'https://cdn.jsdelivr.net/gh/AtlasOfLivingAustralia/ecodata-client-plugin/grails-app/assets/javascripts/forms.js',
             'https://cdn.jsdelivr.net/gh/AtlasOfLivingAustralia/ecodata-client-plugin/grails-app/assets/javascripts/speciesModel.js',
             'https://cdn.jsdelivr.net/gh/AtlasOfLivingAustralia/ecodata-client-plugin/grails-app/assets/javascripts/forms.js',
             'grails-app/assets/javascripts/projectActivityInfo.js',
-Original file line number
+Diff line change
@@ Expand Up / @@ -53,7 +53,7 @@ @@
     }
     .ui-front {
-    	z-index: 100;
+    	z-index: 2000;
     }
@@ Expand Down @@