Skip to content

Commit

Permalink
fixes missing search on spatial and text search
Browse files Browse the repository at this point in the history
  • Loading branch information
mejackreed committed Nov 21, 2014
1 parent 240a5b8 commit 0108528
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 3 deletions.
1 change: 0 additions & 1 deletion app/helpers/geoblacklight_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -69,5 +69,4 @@ def layer_access_image(access)
""
end
end

end
2 changes: 1 addition & 1 deletion app/views/shared/_header_navbar.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</div>
</div>

<% unless current_page?(root_url) %>
<% if controller_name == 'catalog' && has_search_parameters? %>
<div id="search-navbar" class="navbar navbar-default navbar-static-top" role="navigation">
<div class="container">
<%= render_search_bar %>
Expand Down
2 changes: 2 additions & 0 deletions lib/geoblacklight.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ module Geoblacklight
def self.inject!
CatalogController.send(:include, Geoblacklight::ControllerOverride)
CatalogController.send(:include, Geoblacklight::ViewHelperOverride)
CatalogController.send(:helper, Geoblacklight::ViewHelperOverride) unless
CatalogController.helpers.is_a?(Geoblacklight::ViewHelperOverride)
SearchHistoryController.send(:helper, Geoblacklight::ViewHelperOverride) unless
SearchHistoryController.helpers.is_a?(Geoblacklight::ViewHelperOverride)
end
Expand Down
2 changes: 1 addition & 1 deletion lib/geoblacklight/view_helper_override.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ def has_search_parameters?
super || has_spatial_parameters?
end

def query_has_contraints(params = params)
def query_has_contraints?(params = params)
super || has_search_parameters?
end
end
Expand Down
12 changes: 12 additions & 0 deletions spec/features/search_bar_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
require 'spec_helper'

feature 'search bar' do
scenario 'present on a spatial search' do
visit catalog_index_path(bbox: '25, 3, 75, 35')
expect(page).to have_css '#search-navbar'
end
scenario 'present on a text search' do
visit catalog_index_path(q: 'test')
expect(page).to have_css '#search-navbar'
end
end

0 comments on commit 0108528

Please sign in to comment.