diff .svn/pristine/d2/d2d75f5282e4774cc6782dd489046bdab3498c66.svn-base @ 1337:077b8890835a cannam

Merge from live branch

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.svn/pristine/d2/d2d75f5282e4774cc6782dd489046bdab3498c66.svn-base	Thu Jun 20 13:14:02 2013 +0100
@@ -0,0 +1,77 @@
+<%= error_messages_for 'member' %>
+<% roles = Role.find_all_givable
+   members = @project.member_principals.find(:all, :include => [:roles, :principal]).sort %>
+
+<div class="splitcontentleft">
+<% if members.any? %>
+<table class="list members">
+  <thead><tr>
+    <th><%= l(:label_user) %> / <%= l(:label_group) %></th>
+    <th><%= l(:label_role_plural) %></th>
+    <th style="width:15%"></th>
+          <%= call_hook(:view_projects_settings_members_table_header, :project => @project) %>
+  </tr></thead>
+  <tbody>
+  <% members.each do |member| %>
+  <% next if member.new_record? %>
+  <tr id="member-<%= member.id %>" class="<%= cycle 'odd', 'even' %> member">
+  <td class="<%= member.principal.class.name.downcase %>"><%= link_to_user member.principal %></td>
+  <td class="roles">
+    <span id="member-<%= member.id %>-roles"><%=h member.roles.sort.collect(&:to_s).join(', ') %></span>
+      <%= form_for(member, {:as => :membership, :remote => true, :url => membership_path(member),
+                                          :method => :put,
+                                          :html => { :id => "member-#{member.id}-roles-form", :class => 'hol' }}
+             ) do |f| %>
+        <p><% roles.each do |role| %>
+        <label><%= check_box_tag 'membership[role_ids][]', role.id, member.roles.include?(role),
+                                                       :disabled => member.member_roles.detect {|mr| mr.role_id == role.id && !mr.inherited_from.nil?} %> <%=h role %></label><br />
+        <% end %></p>
+        <%= hidden_field_tag 'membership[role_ids][]', '' %>
+        <p><%= submit_tag l(:button_change), :class => "small" %>
+        <%= link_to_function l(:button_cancel),
+                             "$('#member-#{member.id}-roles').show(); $('#member-#{member.id}-roles-form').hide(); return false;"
+             %></p>
+      <% end %>
+  </td>
+  <td class="buttons">
+      <%= link_to_function l(:button_edit),
+                           "$('#member-#{member.id}-roles').hide(); $('#member-#{member.id}-roles-form').show(); return false;",
+                           :class => 'icon icon-edit' %>
+      <%= delete_link membership_path(member),
+                      :remote => true,
+                      :data => (!User.current.admin? && member.include?(User.current) ? {:confirm => l(:text_own_membership_delete_confirmation)} : {}) if member.deletable? %>
+  </td>
+  <%= call_hook(:view_projects_settings_members_table_row, { :project => @project, :member => member}) %>
+  </tr>
+<% end; reset_cycle %>
+  </tbody>
+</table>
+<% else %>
+<p class="nodata"><%= l(:label_no_data) %></p>
+<% end %>
+</div>
+
+<% principals = Principal.active.not_member_of(@project).all(:limit => 100, :order => 'type, login, lastname ASC') %>
+
+<div class="splitcontentright">
+<% if roles.any? && principals.any? %>
+  <%= form_for(@member, {:as => :membership, :url => project_memberships_path(@project), :remote => true, :method => :post}) do |f| %>
+    <fieldset><legend><%=l(:label_member_new)%></legend>
+
+    <p><%= label_tag "principal_search", l(:label_principal_search) %><%= text_field_tag 'principal_search', nil %></p>
+    <%= javascript_tag "observeSearchfield('principal_search', 'principals', '#{ escape_javascript autocomplete_project_memberships_path(@project) }')" %>
+
+    <div id="principals">
+      <%= principals_check_box_tags 'membership[user_ids][]', principals %>
+    </div>
+
+    <p><%= l(:label_role_plural) %>:
+    <% roles.each do |role| %>
+      <label><%= check_box_tag 'membership[role_ids][]', role.id %> <%=h role %></label>
+     <% end %></p>
+
+    <p><%= submit_tag l(:button_add), :id => 'member-add-submit' %></p>
+    </fieldset>
+  <% end %>
+<% end %>
+</div>