Download as
Browse Code »

Commit 7be8e232c154e8dc93f85e4a249e7a4406ff313b

Authored by MoisesMachado
1 parent 03f7cd2a
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

ActionItem4: added a filter by parent and navigaton 


git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@58 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 4 changed files with 7 additions and 3 deletions   Show diff stats
app/controllers/manage_tags_controller.rb
  Diff comments   View file @7be8e23
@@ -5,7 +5,8 @@ class ManageTagsController < ApplicationController @@ -5,7 +5,8 @@ class ManageTagsController < ApplicationController
5 end 5 end
6 6
7 def list 7 def list
8 - @tags = Tag.find_all 8 + @parent = Tag.find(params[:parent]) if params[:parent]
  9 + @tags = Tag.find_all_by_parent_id(params[:parent])
9 end 10 end
10 11
11 def new 12 def new
app/views/manage_tags/_a_tag.rhtml
  Diff comments   View file @7be8e23
1 <li> 1 <li>
  2 +<%= a_tag.id %>
2 <%= a_tag.name %> 3 <%= a_tag.name %>
3 <%= link_to _('Edit'), {:action => 'edit', :id => a_tag } %> 4 <%= link_to _('Edit'), {:action => 'edit', :id => a_tag } %>
4 <%= link_to _('Destroy'), {:action => 'destroy', :id => a_tag} %> 5 <%= link_to _('Destroy'), {:action => 'destroy', :id => a_tag} %>
5 -<ul> 6 +<%= link_to _('Filter by this tag'), {:action => 'list', :parent => a_tag} %><ul>
6 <%= render :partial => 'a_tag', :collection => a_tag.children %> 7 <%= render :partial => 'a_tag', :collection => a_tag.children %>
7 </ul> 8 </ul>
8 </li> 9 </li>
app/views/manage_tags/list.rhtml
  Diff comments   View file @7be8e23
1 <h2> <%= _("Listing tags") %> </h2> 1 <h2> <%= _("Listing tags") %> </h2>
2 2
3 <ul> 3 <ul>
4 - <%= render :partial => 'a_tag', :collection => @tags.select{|t|!t.parent} %> 4 + <%= render :partial => 'a_tag', :collection => @tags %>
5 </ul> 5 </ul>
6 6
  7 +<%= link_to _('Up'), {:action => 'list', :parent => @parent.parent} if @parent %>
7 <%= link_to _('New tag'), {:action => 'new'} %> 8 <%= link_to _('New tag'), {:action => 'new'} %>
db/migrate/007_acts_as_taggable_migration.rb
  Diff comments   View file @7be8e23
@@ -3,6 +3,7 @@ class ActsAsTaggableMigration &lt; ActiveRecord::Migration @@ -3,6 +3,7 @@ class ActsAsTaggableMigration &lt; ActiveRecord::Migration
3 create_table :tags do |t| 3 create_table :tags do |t|
4 t.column :name, :string 4 t.column :name, :string
5 t.column :parent_id, :integer 5 t.column :parent_id, :integer
  6 + t.column :pending, :bool
6 end 7 end
7 8
8 create_table :taggings do |t| 9 create_table :taggings do |t|