diff --git a/app/controllers/concerns/commentable_actions.rb b/app/controllers/concerns/commentable_actions.rb index a6f3fd817..a6f150a29 100644 --- a/app/controllers/concerns/commentable_actions.rb +++ b/app/controllers/concerns/commentable_actions.rb @@ -84,7 +84,7 @@ module CommentableActions end def parse_advanced_search_terms - @advanced_search_present = @advanced_search_terms = params[:advanced_search] if params[:advanced_search].present? + @advanced_search_terms = params[:advanced_search] if params[:advanced_search].present? parse_search_date end diff --git a/app/controllers/proposals_controller.rb b/app/controllers/proposals_controller.rb index dbd4630f3..c60d7cc43 100644 --- a/app/controllers/proposals_controller.rb +++ b/app/controllers/proposals_controller.rb @@ -15,7 +15,7 @@ class ProposalsController < ApplicationController respond_to :html, :js def index_customization - @featured_proposals = Proposal.all.sort_by_confidence_score.limit(3) if (!@advanced_search_present && @search_terms.blank? && @tag_filter.blank?) + @featured_proposals = Proposal.all.sort_by_confidence_score.limit(3) if (!@advanced_search_terms && @search_terms.blank? && @tag_filter.blank?) if @featured_proposals.present? set_featured_proposal_votes(@featured_proposals) @resources = @resources.where('proposals.id NOT IN (?)', @featured_proposals.map(&:id)) diff --git a/app/views/debates/index.html.erb b/app/views/debates/index.html.erb index f47be896f..04f4a5ff6 100644 --- a/app/views/debates/index.html.erb +++ b/app/views/debates/index.html.erb @@ -11,10 +11,10 @@
- <% if @search_terms || @advanced_search_present %> + <% if @search_terms || @advanced_search_terms %>

<%= page_entries_info @debates %> - <% if !@advanced_search_present %> + <% if !@advanced_search_terms %> <%= t("debates.index.search_results", count: @debates.size, search_term: @search_terms) %> <% end %>

@@ -32,7 +32,7 @@ <%= render 'shared/order_links', i18n_namespace: "debates.index" %> - <% if @tag_filter || @search_terms || @advanced_search_present %> + <% if @tag_filter || @search_terms || @advanced_search_terms %>
<%= t("debates.index.select_order") %> diff --git a/app/views/proposals/index.html.erb b/app/views/proposals/index.html.erb index f6f8f825f..6a08a1646 100644 --- a/app/views/proposals/index.html.erb +++ b/app/views/proposals/index.html.erb @@ -11,10 +11,10 @@
- <% if @search_terms || @advanced_search_present %> + <% if @search_terms || @advanced_search_terms %>

<%= page_entries_info @proposals %> - <% if !@advanced_search_present %> + <% if !@advanced_search_terms %> <%= t("proposals.index.search_results", count: @proposals.size, search_term: @search_terms) %> <% end %>

@@ -26,7 +26,7 @@ <% end %>
- <% if @tag_filter || @search_terms || @advanced_search_present %> + <% if @tag_filter || @search_terms || @advanced_search_terms %>
<%= t("proposals.index.select_order") %> diff --git a/app/views/shared/_advanced_search.html.erb b/app/views/shared/_advanced_search.html.erb index ebe4b50e4..ef58c8f8a 100644 --- a/app/views/shared/_advanced_search.html.erb +++ b/app/views/shared/_advanced_search.html.erb @@ -57,7 +57,7 @@ //open advantage options menu -var open = <%= raw @advanced_search_present.to_json.html_safe %>; +var open = <%= raw @advanced_search_terms.to_json.html_safe %>; if(!open) $('#advanced-search').hide();