From d3f9920e2806399ff56798545593acbfa9ca6d0c Mon Sep 17 00:00:00 2001
From: Ana <anamma06@gmail.com>
Date: Tue, 5 Jan 2016 12:35:35 +0100
Subject: [PATCH] Advanced search corrections

---
 app/controllers/concerns/commentable_actions.rb | 3 ++-
 app/views/shared/_advanced_search.html.erb      | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/controllers/concerns/commentable_actions.rb b/app/controllers/concerns/commentable_actions.rb
index 590ff1fec..fbbe5aee2 100644
--- a/app/controllers/concerns/commentable_actions.rb
+++ b/app/controllers/concerns/commentable_actions.rb
@@ -34,7 +34,7 @@ module CommentableActions
     @resources = @resources.tagged_with(@tag_filter) if @tag_filter
     @resources = @resources.page(params[:page]).for_render.send("sort_by_#{@current_order}")
     index_customization if index_customization.present?
-    
+
     @tag_cloud = tag_cloud
     set_resource_votes(@resources)
     set_resources_instance
@@ -116,6 +116,7 @@ module CommentableActions
         @params_date = search[:date] if search[:date].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?
+        @search_terms = search[:search] if search[:search].present?
         @advanced_search_present = true if params[:commit] || @params_author || @params_author_type || @params_date
       end
     end
diff --git a/app/views/shared/_advanced_search.html.erb b/app/views/shared/_advanced_search.html.erb
index c95960a24..a36ba7daf 100644
--- a/app/views/shared/_advanced_search.html.erb
+++ b/app/views/shared/_advanced_search.html.erb
@@ -12,7 +12,7 @@
 
     <div class="small-12 medium-12 advanced-search columns">
       <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 class="small-12 medium-6 advanced-search columns">