0.6.4 release

layout fix for IE and firefox. closes #207
AtlasOfLivingAustralia · May 15, 2019 · 194a4f3 · 194a4f3
1 parent e93b792
commit 194a4f3
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 10 deletions.
diff --git a/.asscache b/.asscache
diff --git a/build.gradle b/build.gradle
@@ -18,7 +18,7 @@ plugins {
     id "com.gorylenko.gradle-git-properties" version "1.4.17"
 }
 
-version "0.6.4-SNAPSHOT"
+version "0.6.4"
 group "au.org.ala"
 
 apply plugin:"eclipse"

diff --git a/grails-app/controllers/au/org/ala/phyloviz/AlaController.groovy b/grails-app/controllers/au/org/ala/phyloviz/AlaController.groovy
@@ -403,9 +403,9 @@ class AlaController extends BaseController {
      */
     def getRecordsList(){
         def userId = authService.getUserId();
-        Integer phyloId= params.int('phyloId');
+        Integer phyloId = params.int('phyloId');
         def result = alaService.getRecordsList(userId, phyloId);
-        if(params.callback){
+        if (params.callback){
             render(contentType: 'text/javascript', text: "${params.callback}(${result as JSON})")
         } else {
             render( text: result as JSON, contentType: 'application/json');

diff --git a/grails-app/services/au/org/ala/phyloviz/BootstrapService.groovy b/grails-app/services/au/org/ala/phyloviz/BootstrapService.groovy
@@ -20,7 +20,7 @@ class BootstrapService {
         //update alaDataresourceInfo with biocache urls
         grailsApplication.config.alaDataresourceInfo.biocacheServiceUrl = grailsApplication.config.biocacheServiceUrl
         grailsApplication.config.alaDataresourceInfo.biocacheHubUrl = grailsApplication.config.biocacheHubUrl
-        grailsApplication.config.alaDataresourceInfo.layerUrl = grailsApplication.config.biocacheServiceUrl + grailsApplication.config.alaDataresourceInfo.layerUrl
+        grailsApplication.config.alaDataresourceInfo.layerUrl = grailsApplication.config.alaDataresourceInfo.layerUrl
         grailsApplication.config.alaDataresourceInfo.title = "All occurrences"
         grailsApplication.config.alaDataresourceInfo.type = "ala"
         grailsApplication.config.alaDataresourceInfo.id = -1

diff --git a/grails-app/services/au/org/ala/phyloviz/SandboxService.groovy b/grails-app/services/au/org/ala/phyloviz/SandboxService.groovy
@@ -244,10 +244,12 @@ class SandboxService {
             owner == owner && status == status
         };
         def result = [], cs =  new au.org.ala.phyloviz.ConvertSandbox();
-        s.each{ item ->
+        s.each { item ->
             def c = cs.convert(item)
-            if (!c.containsKey('biocacheServiceUrl') || !c.biocacheServiceUrl) c.put('biocacheServiceUrl', grailsApplication.config.sandboxBiocacheServiceUrl)
-            if (!c.containsKey('biocacheHubUrl') || !c.biocacheHubUrl) c.put('biocacheHubUrl', grailsApplication.config.sandboxHubUrl)
+            if (!c.containsKey('biocacheServiceUrl') || !c.biocacheServiceUrl)
+                c.put('biocacheServiceUrl', grailsApplication.config.sandboxBiocacheServiceUrl)
+            if (!c.containsKey('biocacheHubUrl') || !c.biocacheHubUrl)
+                c.put('biocacheHubUrl', grailsApplication.config.sandboxHubUrl)
             result.push(c)
         }
         return result;
@@ -290,8 +292,10 @@ class SandboxService {
         def result = [], cs =  new au.org.ala.phyloviz.ConvertSandbox()
         s.each{ item ->
             def c = cs.convert(item)
-            if (!c.containsKey('biocacheServiceUrl') || !c.biocacheServiceUrl) c.put('biocacheServiceUrl', grailsApplication.config.sandboxBiocacheServiceUrl)
-            if (!c.containsKey('biocacheHubUrl') || !c.biocacheHubUrl) c.put('biocacheHubUrl', grailsApplication.config.sandboxHubUrl)
+            if (!c.containsKey('biocacheServiceUrl') || !c.biocacheServiceUrl)
+                c.put('biocacheServiceUrl', grailsApplication.config.sandboxBiocacheServiceUrl)
+            if (!c.containsKey('biocacheHubUrl') || !c.biocacheHubUrl)
+                c.put('biocacheHubUrl', grailsApplication.config.sandboxHubUrl)
             result.push(c)
         }
         return result;

diff --git a/grails-app/views/phylo/show.gsp b/grails-app/views/phylo/show.gsp
@@ -56,7 +56,7 @@
         <div class="col-sm-4 col-md-4" style="padding-right:0px; padding-left:0px; height:100%; display: table-cell; float: none;">
             <div id="info" style="height:100%;"></div>
         </div>
-        <div role="tabpanel" id="tabs" class="col-sm-8 col-md-8" style="padding-left:0px; margin-left:0px; margin-right:0px; width: 100%; height:100%;  display: table-cell; float: none;">
+        <div role="tabpanel" id="tabs" class="col-sm-8 col-md-8" style="padding-left:0px; margin-left:0px; margin-right:0px; width: 100%; height:100%;  display: table-cell;">
 
             <div style="float:left;">
                 <div id="vizTitle"><g:render template="title"></g:render></div>