Merge branch 'hotfix/1.60.1'

AtlasOfLivingAustralia · Sep 25, 2020 · 4911ebf · 4911ebf
2 parents d27a5a7 + f4538f2
commit 4911ebf
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/application.properties b/application.properties
@@ -2,5 +2,5 @@
 #Tue Jun 20 09:06:54 EST 2017
 app.grails.version=2.5.6
 app.name=fieldcapture
-app.version=1.60
+app.version=1.60.1
 
diff --git a/grails-app/views/activity/activityReportView.gsp b/grails-app/views/activity/activityReportView.gsp
@@ -147,12 +147,14 @@
             var reportSite =  ${reportSite?.encodeAsJSON() ?: '{}' };
             var formFeatures = new ecodata.forms.FeatureCollection(reportSite ? reportSite.features : []);
             fcConfig.featureCollection = formFeatures;
+            <g:if test="${!printView}">
             var mapOptions = {};
             if (fcConfig.useGoogleBaseMap) {
                 mapOptions.baseLayersName = 'Google'; // Default is Open Street Maps
             }
             // Initialise our map so we can supply options (otherwise it's initialised  with  defaults)
             ecodata.forms.maps.featureMap(mapOptions);
+            </g:if>
         }
 
         $('.imageList a[target="_photo"]').attr('rel', 'gallery').fancybox({type:'image', autoSize:true, nextEffect:'fade', preload:0, 'prevEffect':'fade'});

diff --git a/grails-app/views/layouts/nrmPrint.gsp b/grails-app/views/layouts/nrmPrint.gsp
@@ -40,7 +40,5 @@
 
     </asset:script>
 </g:if>
-
-<r:layoutResources/>
 </body>
 </html>
-Original file line number
+Diff line change
@@ Expand Up / @@ -40,7 +40,5 @@ @@
         </asset:script>
     </g:if>
-    <r:layoutResources/>
     </body>
     </html>