Download as
Browse Code »

Commit 46b708cb6b9216f23799d268e25d1f122b4fd444

Authored by MoisesMachado
1 parent 9e9bd5c8
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

ActionItem4: added search tags by name 

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@141 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 5 changed files with 29 additions and 3 deletions   Show diff stats
app/controllers/manage_tags_controller.rb
  Diff comments   View file @46b708c
@@ -67,4 +67,9 @@ class ManageTagsController < ApplicationController @@ -67,4 +67,9 @@ class ManageTagsController < ApplicationController
67 redirect_to :action => 'list' 67 redirect_to :action => 'list'
68 end 68 end
69 end 69 end
  70 +
  71 + # Full-text search for tags that have the query terms
  72 + def search
  73 + @tags_found = Tag.find_by_contents(params[:query][:term])
  74 + end
70 end 75 end
app/views/manage_tags/_form.rhtml
  Diff comments   View file @46b708c
1 -Name: <%= text_field 'tag', 'name' %> <br>  
2 -Parent tag: <%= select('tag', 'parent_id', @parent_tags.collect {|p| [ p.name, p.id ] }, { :include_blank => true }) %> <br>  
3 -Pending: <%= check_box 'tag', 'pending' %> <br> 1 +<%= _('Name') %>: <%= text_field 'tag', 'name' %> <br>
  2 +<%= _('Parent tag') %>: <%= select('tag', 'parent_id', @parent_tags.collect {|p| [ p.name, p.id ] }, { :include_blank => true }) %> <br>
  3 +<%= _('Pending') %>: <%= check_box 'tag', 'pending' %> <br>
app/views/manage_tags/list.rhtml
  Diff comments   View file @46b708c
  1 +<br/>
  2 +<% form_tag :action => 'search' do %>
  3 + <%= text_field 'query', 'term'%>
  4 + <%= submit_tag _('Search') %>
  5 +<% end %>
  6 +
1 <h2> <%= _("Listing tags") %> </h2> 7 <h2> <%= _("Listing tags") %> </h2>
2 8
3 <ul> 9 <ul>
app/views/manage_tags/search.rhtml 0 → 100644
  Diff comments   View file @46b708c
@@ -0,0 +1,10 @@ @@ -0,0 +1,10 @@
  1 +<h2> <%= _('Matching tags') %></h2>
  2 +
  3 +<% if not @tags_found.empty? %>
  4 + <%= @tags_found.size.to_s + (@tags_found.size > 1 ? ' tags' : ' tag') + _(' was found') %>
  5 + <%= render :partial => 'a_tag', :collection => @tags_found %>
  6 +<% else %>
  7 + <%= _('No tags found matching criteria') %>
  8 +<% end %>
  9 +
  10 +<%= link_to _('Back'), :action => 'list' %>
lib/extended_tag.rb
  Diff comments   View file @46b708c
1 class Tag 1 class Tag
  2 +
2 @@original_find = self.method(:find) 3 @@original_find = self.method(:find)
3 # Rename the find method to find_with_pendings that includes all tags in the search regardless if its pending or not 4 # Rename the find method to find_with_pendings that includes all tags in the search regardless if its pending or not
4 def self.find_with_pendings(*args) 5 def self.find_with_pendings(*args)
5 @@original_find.call(*args) 6 @@original_find.call(*args)
6 end 7 end
  8 +
7 # Redefine the find method to exclude the pending tags from the search not allowing to tag something with an unapproved tag 9 # Redefine the find method to exclude the pending tags from the search not allowing to tag something with an unapproved tag
8 def self.find(*args) 10 def self.find(*args)
9 self.with_scope(:find => { :conditions => ['pending = ?', false] }) do 11 self.with_scope(:find => { :conditions => ['pending = ?', false] }) do
@@ -11,6 +13,9 @@ class Tag @@ -11,6 +13,9 @@ class Tag
11 end 13 end
12 end 14 end
13 15
  16 + acts_as_ferret :fields => [:name]
  17 +
  18 +
14 # Return all the tags that were suggested but not yet approved 19 # Return all the tags that were suggested but not yet approved
15 def self.find_pendings 20 def self.find_pendings
16 self.find_with_pendings(:all, :conditions => ['pending = ?', true]) 21 self.find_with_pendings(:all, :conditions => ['pending = ?', true])