Download as
Browse Code »

Commit e48e8f422a94e5c11ee465389050b4f94d713270

Authored by Victor Costa
1 parent 983ad76a
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

Do not show tool label if there is no tool on a step

Showing 2 changed files with 11 additions and 8 deletions   Show diff stats
plugins/community_track/test/functional/community_track_plugin_content_viewer_controller_test.rb
  Diff comments   View file @e48e8f4
@@ -56,7 +56,7 @@ class ContentViewerControllerTest < ActionController::TestCase @@ -56,7 +56,7 @@ class ContentViewerControllerTest < ActionController::TestCase
56 end 56 end
57 57
58 should 'show tools for a step' do 58 should 'show tools for a step' do
59 - Article.create!(:profile => @profile, :name => 'article', :parent => @step) 59 + TinyMceArticle.create!(:profile => @profile, :name => 'article', :parent => @step)
60 get :view_page, @step.url 60 get :view_page, @step.url
61 assert_tag :tag => 'div', :attributes => { :class => 'tools' }, :descendant => { :tag => 'div', :attributes => { :class => 'item' } } 61 assert_tag :tag => 'div', :attributes => { :class => 'tools' }, :descendant => { :tag => 'div', :attributes => { :class => 'item' } }
62 end 62 end
plugins/community_track/views/content_viewer/step.rhtml
  Diff comments   View file @e48e8f4
@@ -9,17 +9,20 @@ @@ -9,17 +9,20 @@
9 <div> 9 <div>
10 <%= step.body %> 10 <%= step.body %>
11 </div> 11 </div>
12 - <h3><%= _("Tool") %></h3>  
13 <% if step.allow_create?(user) && !step.tool && step.tool_class %> 12 <% if step.allow_create?(user) && !step.tool && step.tool_class %>
  13 + <h3><%= _("Tool") %></h3>
14 <div class="actions"> 14 <div class="actions">
15 <a href="<%= url_for({:controller => 'cms', :action => 'new', :type => step.tool_type.constantize, :parent_id => @page}) %>" class="button with-text icon-new icon-new<%= step.tool_class.icon_name %>"><%= _('Create %s' % step.tool_class.short_description) %></a> 15 <a href="<%= url_for({:controller => 'cms', :action => 'new', :type => step.tool_type.constantize, :parent_id => @page}) %>" class="button with-text icon-new icon-new<%= step.tool_class.icon_name %>"><%= _('Create %s' % step.tool_class.short_description) %></a>
16 </div> 16 </div>
17 <% end %> 17 <% end %>
18 - <div class="tools">  
19 - <div class="item">  
20 - <div class="name">  
21 - <%= link_to(step.tool.name, step.tool.view_url, :class=>"button with-text icon-new icon-new#{step.tool.class.icon_name}") if step.tool %> 18 + <% if step.tool %>
  19 + <h3><%= _("Tool") %></h3>
  20 + <div class="tools">
  21 + <div class="item">
  22 + <div class="name">
  23 + <%= link_to(step.tool.name, step.tool.view_url, :class=>"button with-text icon-new icon-new#{step.tool.class.icon_name}") %>
  24 + </div>
22 </div> 25 </div>
23 - </div>  
24 - </div> 26 + </div>
  27 + <% end %>
25 </div> 28 </div>