Update settings so that ARCGIS_HIDE and CARTO_HIDE are optional

geoblacklight · Aug 6, 2019 · 62bbc49 · 62bbc49
1 parent a77679b
commit 62bbc49
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/app/helpers/geoblacklight_helper.rb b/app/helpers/geoblacklight_helper.rb
@@ -170,15 +170,15 @@ def display_carto
       t('geoblacklight.tools.open_carto'),
       carto_link(@document.carto_reference),
       target: '_blank'
-    ) if @document.carto_reference.present? && Settings.CARTO_DISPLAY
+    ) if @document.carto_reference.present? && !Settings.CARTO_HIDE
   end
 
   def display_arcgis
     return link_to(
       blacklight_icon('esri-globe') + ' ' +
       t('geoblacklight.tools.open_arcgis'),
       arcgis_link(@document.arcgis_urls)
-    ) if @document.arcgis_urls.present? && Settings.ARCGIS_DISPLAY
+    ) if @document.arcgis_urls.present? && !Settings.ARCGIS_HIDE
   end
 
   ##

diff --git a/lib/generators/geoblacklight/templates/settings.yml b/lib/generators/geoblacklight/templates/settings.yml
@@ -4,11 +4,11 @@ APPLICATION_LOGO_URL: 'http://geoblacklight.org/images/geoblacklight-logo.png'
 # Carto OneClick Service https://carto.com/engine/open-in-carto/
 CARTO_ONECLICK_LINK: 'http://oneclick.carto.com/'
 
-# Display Carto export link
-CARTO_DISPLAY: true
+# Hide Carto export link
+# CARTO_HIDE: true
 
-# Display ArcGIS export link
-ARCGIS_DISPLAY: true
+# Hide ArcGIS export link
+# ARCGIS_HIDE: true
 
 # ArcGIS Online Base URL
 ARCGIS_BASE_URL: 'https://www.arcgis.com/home/webmap/viewer.html'

diff --git a/spec/features/exports_spec.rb b/spec/features/exports_spec.rb
@@ -25,9 +25,8 @@
     end
   end
   context 'when carto is configured not to display' do
-    let(:CARTO_DISPLAY) { false }
     before do
-      allow(Settings).to receive(:CARTO_DISPLAY)
+      allow(Settings).to receive(:CARTO_HIDE).and_return(true)
     end
     it 'will not display the carto link' do
       visit solr_document_path 'tufts-cambridgegrid100-04'