diff --git a/app/controllers/management/proposals_controller.rb b/app/controllers/management/proposals_controller.rb
index 2b0de30d6..283aa9428 100644
--- a/app/controllers/management/proposals_controller.rb
+++ b/app/controllers/management/proposals_controller.rb
@@ -1,13 +1,12 @@
class Management::ProposalsController < Management::BaseController
skip_before_action :verify_manager
include HasOrders
+ include CommentableActions
before_action :set_proposal, only: :vote
- has_orders %w{hot_score confidence_score created_at most_commented random}, only: :index
+ before_action :parse_search_terms, only: :index
- def index
- @proposals = Proposal.all.limit(10).page(params[:page])
- end
+ has_orders %w{hot_score confidence_score created_at most_commented random}, only: :index
def vote
@proposal.register_vote(current_user, 'yes')
@@ -30,4 +29,8 @@ class Management::ProposalsController < Management::BaseController
User.first
end
+ def resource_model
+ Proposal
+ end
+
end
\ No newline at end of file
diff --git a/app/views/admin/shared/_proposal_search.html.erb b/app/views/admin/shared/_proposal_search.html.erb
new file mode 100644
index 000000000..9604edf34
--- /dev/null
+++ b/app/views/admin/shared/_proposal_search.html.erb
@@ -0,0 +1,10 @@
+<%= form_for(Proposal.new, url: url, as: :proposal, method: :get) do |f| %>
+
+
+ <%= text_field_tag :search, "", placeholder: t("admin.shared.proposal_search.placeholder") %>
+
+
+ <%= f.submit t("admin.shared.proposal_search.button"), class: "button radius success" %>
+
+
+<% end %>
\ No newline at end of file
diff --git a/app/views/management/proposals/index.html.erb b/app/views/management/proposals/index.html.erb
index 2aa28c219..f6044265c 100644
--- a/app/views/management/proposals/index.html.erb
+++ b/app/views/management/proposals/index.html.erb
@@ -1,4 +1,6 @@
+ <%= render 'admin/shared/proposal_search', url: management_proposals_path %>
+
diff --git a/config/locales/admin.en.yml b/config/locales/admin.en.yml
index d298f8250..a70329132 100644
--- a/config/locales/admin.en.yml
+++ b/config/locales/admin.en.yml
@@ -26,6 +26,9 @@ en:
user_search:
placeholder: 'Search user by name or email'
button: 'Search'
+ proposal_search:
+ placeholder: 'Search proposals by title, description or question'
+ button: 'Search'
organizations:
index:
title: Organizations
diff --git a/config/locales/admin.es.yml b/config/locales/admin.es.yml
index b9845c21e..40aef5f24 100644
--- a/config/locales/admin.es.yml
+++ b/config/locales/admin.es.yml
@@ -26,6 +26,9 @@ es:
user_search:
placeholder: 'Buscar usuario por nombre o email'
button: 'Buscar'
+ proposal_search:
+ placeholder: 'Buscar propuestas por título, descripción o pregunta'
+ button: 'Buscar'
organizations:
index:
title: Organizaciones