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

removes duplication between debate and proposal suggestions

Browse Source
This commit is contained in:
rgarcia
2016-02-03 19:02:19 +01:00
parent 37012fda5c
commit e4a49f802e
8 changed files with 34 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,13 +30,8 @@ module CommentableActions
end end
def suggest def suggest
@limit = 5
@resources = @search_terms.present? ? resource_model.search(@search_terms) : nil @resources = @search_terms.present? ? resource_model.search(@search_terms) : nil
set_resources_instance
if @resources
@resources_count = @resources.count
@reg_show = 5
render layout: false
end
end end
def create def create

1
app/controllers/debates_controller.rb
View File

@@ -15,6 +15,7 @@ class DebatesController < ApplicationController
has_orders %w{most_voted newest oldest}, only: :show has_orders %w{most_voted newest oldest}, only: :show
load_and_authorize_resource load_and_authorize_resource
helper_method :resource_model, :resource_name
respond_to :html, :js respond_to :html, :js
def vote def vote

1
app/controllers/proposals_controller.rb
View File

@@ -14,6 +14,7 @@ class ProposalsController < ApplicationController
has_orders %w{most_voted newest oldest}, only: :show has_orders %w{most_voted newest oldest}, only: :show
load_and_authorize_resource load_and_authorize_resource
helper_method :resource_model, :resource_name
respond_to :html, :js respond_to :html, :js
def index_customization def index_customization

22
app/views/debates/_suggest.html.erb
View File

@@ -1,22 +0,0 @@
<div class="small-12 column" >
<% if @search_terms && @resources_count > 0 %>
<div class="alert-box radius warning">
<p class="note-marked">
<%= t("debates.new.suggestions.found", count: @resources_count, query: @search_terms)%>
</p>
<ul>
<% @debates.take(@reg_show).each do |debate| %>
<li> <%= link_to debate.title, debate %> </li>
<% end %>
</ul>
<% if @resources_count > @reg_show %>
<p class="note-marked">
<%= t("debates.new.suggestions.message", count: @resources_count,
query: @search_terms,
limit: @reg_show) %>
<%= link_to t("debates.new.suggestions.see_all"), debates_path(search: @search_terms)%>
</p>
<% end %>
</div>
<% end %>
</div>

2
app/views/debates/suggest.js.erb
View File

@@ -1 +1 @@
<%= render "suggest" %> <%= render "shared/suggest" %>

22
app/views/proposals/_suggest.html.erb
View File

@@ -1,22 +0,0 @@
<div class="small-12 column" >
<% if @search_terms && @resources_count > 0 %>
<div class="alert-box radius warning">
<p class="note-marked">
<%= t("proposals.new.suggestions.found", count: @resources_count, query: @search_terms)%>
</p>
<ul>
<% @proposals.take(@reg_show).each do |proposal| %>
<li> <%= link_to proposal.title, proposal %> </li>
<% end %>
</ul>
<% if @resources_count > @reg_show %>
<p class="note-marked">
<%= t("proposals.new.suggestions.message", count: @resources_count,
query: @search_terms,
limit: @reg_show) %>
<%= link_to t("proposals.new.suggestions.see_all"), proposals_path(search: @search_terms)%>
</p>
<% end %>
</div>
<% end %>
</div>

2
app/views/proposals/suggest.js.erb
View File

@@ -1 +1 @@
<%= render "suggest" %> <%= render "shared/suggest" %>

29
app/views/shared/_suggest.html.erb Normal file
View File

@@ -0,0 +1,29 @@
<div class="small-12 column" >
<% if @search_terms && @resources.any? %>
<div class="alert-box radius warning">
<p class="note-marked">
<%= t("shared.suggest.#{resource_name}.found",
count: @resources.count,
query: @search_terms)%>
</p>
<ul>
<% @resources.limit(@limit).each do |resource| %>
<li><%= link_to resource.title, resource %></li>
<% end %>
</ul>
<% if @resources.count > @limit %>
<p class="note-marked">
<%= t("shared.suggest.#{resource_name}.message",
count: @resources.count,
query: @search_terms,
limit: @limit) %>
<%= link_to t("shared.suggest.#{resource_name}.see_all"),
polymorphic_url(resource_model, search: @search_terms)%>
</p>
<% end %>
</div>
<% end %>
</div>