Merged r2829 from trunk

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/0.8-stable@2830 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/views/users/_memberships.rhtml b/app/views/users/_memberships.rhtml
index 94b49159e4f433b6e2f52ea2e47e8e21dc4efe7c..86b3a218c7d89a55f4d22b95fb16b89912afe124 100644 (file)
--- a/app/views/users/_memberships.rhtml
+++ b/app/views/users/_memberships.rhtml
@@ -4,6 +4,7 @@
          <th><%= l(:label_project) %></th>
          <th><%= l(:label_role) %></th>
          <th style="width:15%"></th>
+      <%= call_hook(:view_users_memberships_table_header, :user => @user )%>
        </thead>
        <tbody>
        <% @memberships.each do |membership| %>
@@ -19,6 +20,7 @@
     <td align="center">
       <%= link_to l(:button_delete), {:action => 'destroy_membership', :id => @user, :membership_id => membership }, :method => :post, :class => 'icon icon-del' %>
     </td>
+      <%= call_hook(:view_users_memberships_table_row, :user => @user, :membership => membership, :roles => roles, :projects => projects )%>
        </tr>
        </tbody>
 <% end; reset_cycle %>