Download as
Browse Code »

Commit c456fe2231fac30e8b14a787bb7bc8c72ad2c8ce

Authored by Braulio Bhavamitra
2 parents b60d857b 09a2aaf6
Exists in master and in 27 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, temp_ratings, tests, tests_fixies

Merge branch 'master' into 'master' 

Do not show the "profile actions buttons" twice in MyNetworkBlock

See merge request !453
Showing 1 changed file with 1 additions and 3 deletions   Show diff stats
app/views/blocks/my_network.html.erb
  Diff comments   View file @c456fe2
1 <%= block_title(title) %> 1 <%= block_title(title) %>
2 2
3 -<%= render_profile_actions owner.class %>  
4 -  
5 <ul> 3 <ul>
6 <li><%= link_to(_('Homepage'), owner.url, :class => 'url') %></li> 4 <li><%= link_to(_('Homepage'), owner.url, :class => 'url') %></li>
7 <li><%= link_to(_('View profile'), owner.public_profile_url) %></li> 5 <li><%= link_to(_('View profile'), owner.public_profile_url) %></li>
@@ -11,5 +9,5 @@ @@ -11,5 +9,5 @@
11 </ul> 9 </ul>
12 10
13 <div class="my-network-actions"> 11 <div class="my-network-actions">
14 - <%= render 'blocks/profile_info_actions/' + owner.class.name.underscore %> 12 + <%= render_profile_actions owner.class %>
15 </div> 13 </div>