consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Advanced search corrections

Browse Source
This commit is contained in:
Ana
2016-01-05 12:35:35 +01:00
committed by rgarcia
parent 48d6a76491
commit d3f9920e28
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/concerns/commentable_actions.rb
View File

@@ -34,7 +34,7 @@ module CommentableActions
@resources = @resources.tagged_with(@tag_filter) if @tag_filter @resources = @resources.tagged_with(@tag_filter) if @tag_filter
@resources = @resources.page(params[:page]).for_render.send("sort_by_#{@current_order}") @resources = @resources.page(params[:page]).for_render.send("sort_by_#{@current_order}")
index_customization if index_customization.present? index_customization if index_customization.present?
@tag_cloud = tag_cloud @tag_cloud = tag_cloud
set_resource_votes(@resources) set_resource_votes(@resources)
set_resources_instance set_resources_instance
@@ -116,6 +116,7 @@ module CommentableActions
@params_date = search[:date] if search[:date].present? @params_date = search[:date] if search[:date].present?
@params_date_min = search[:date_min] if (@params_date == '5') && search[:date_min].present? @params_date_min = search[:date_min] if (@params_date == '5') && search[:date_min].present?
@params_date_max = search[:date_max] if (@params_date == '5') && search[:date_max].present? @params_date_max = search[:date_max] if (@params_date == '5') && search[:date_max].present?
@search_terms = search[:search] if search[:search].present?
@advanced_search_present = true if params[:commit] || @params_author || @params_author_type || @params_date @advanced_search_present = true if params[:commit] || @params_author || @params_author_type || @params_date
end end
end end

2
app/views/shared/_advanced_search.html.erb
View File

@@ -12,7 +12,7 @@
<div class="small-12 medium-12 advanced-search columns"> <div class="small-12 medium-12 advanced-search columns">
<h5 class='search-option inline-block'><%= t("shared.advanced_search.general") %></h5> <h5 class='search-option inline-block'><%= t("shared.advanced_search.general") %></h5>
<%= text_field_tag "search", @search_terms, placeholder: t("shared.advanced_search.general") %> <%= text_field_tag "advanced_search[search]", @search_terms, placeholder: t("shared.advanced_search.general_placeholder") %>
</div> </div>
<div class="small-12 medium-6 advanced-search columns"> <div class="small-12 medium-6 advanced-search columns">