Download as
Browse Code »

Commit 6612138c84be61a8c0f229448c39e7593dbc4f27

Authored by MoisesMachado
1 parent 429ffa3d
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: _list.rhtml pratial removed and _a_tag.rhtml added in its place. 


git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@52 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 4 changed files with 11 additions and 10 deletions   Show diff stats
app/controllers/manage_tags_controller.rb
  Diff comments   View file @6612138
@@ -26,8 +26,9 @@ class ManageTagsController < ApplicationController @@ -26,8 +26,9 @@ class ManageTagsController < ApplicationController
26 end 26 end
27 27
28 def edit 28 def edit
29 - @parent_tags = Tag.find_all  
30 @tag = Tag.find(params[:id]) 29 @tag = Tag.find(params[:id])
  30 + @parent_tags = Tag.find_all.select{|pt| !pt.ancestors.include?(@tag) and pt != @tag}
  31 +
31 end 32 end
32 33
33 def update 34 def update
app/views/manage_tags/_a_tag.rhtml 0 → 100644
  Diff comments   View file @6612138
@@ -0,0 +1,8 @@ @@ -0,0 +1,8 @@
  1 +<li>
  2 +<%= a_tag.name %>
  3 +<%= link_to _('Edit'), {:action => 'edit', :id => a_tag } %>
  4 +<%= link_to _('Destroy'), {:action => 'destroy', :id => a_tag} %>
  5 +<ul>
  6 + <%= render :partial => 'a_tag', :collection => a_tag.children %>
  7 +</ul>
  8 +</li>
app/views/manage_tags/_form.rhtml
  Diff comments   View file @6612138
1 Name: <%= text_field 'tag', 'name' %> <br> 1 Name: <%= text_field 'tag', 'name' %> <br>
2 -Parent tag: <%= select_tag 'parent_id', ['<option value="0"></option>'] + @parent_tags.select{|pt| !pt.ancestors.include?(@tag) and pt != @tag}.map {|n|"<option value=\"#{n.id}\" #{'selected="selected"' if @tag.parent == n} >" + n.name + '</option>'} %> <br> 2 +Parent tag: <%= select_tag 'parent_id', ['<option value="0"></option>'] + @parent_tags.map {|pt|"<option value=\"#{pt.id}\" #{'selected="selected"' if @tag.parent == pt} >" + pt.name + '</option>'} %> <br>
app/views/manage_tags/_list.rhtml
View file @429ffa3
@@ -1,8 +0,0 @@ @@ -1,8 +0,0 @@
1 -<li>  
2 -<%= a_tag.name %>  
3 -<ul>  
4 -<% a_tag.children.each do |child|%>  
5 -<%= render :partial =>'list', :locals => {:a_tag => child} %>  
6 -<% end %>  
7 -</ul>  
8 -</li>