diff app/views/projects/settings/_members.html.erb @ 1298:4f746d8966dd redmine_2.3_integration

Merge from redmine-2.3 branch to create new branch redmine-2.3-integration

--- a/app/views/projects/settings/_members.html.erb	Fri Jun 14 09:07:32 2013 +0100
+++ b/app/views/projects/settings/_members.html.erb	Fri Jun 14 09:28:30 2013 +0100
@@ -1,6 +1,6 @@
 <%= error_messages_for 'member' %>
 <% roles = Role.find_all_givable
-   members = @project.member_principals.find(:all, :include => [:roles, :principal]).sort %>
+   members = @project.member_principals.includes(:roles, :principal).all.sort %>
 
 <div class="splitcontentleft">
 <% if members.any? %>
@@ -51,18 +51,16 @@
 <% 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? %>
+<% if roles.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) }')" %>
+    <%= javascript_tag "observeSearchfield('principal_search', null, '#{ escape_javascript autocomplete_project_memberships_path(@project, :format => 'js') }')" %>
 
-    <div id="principals">
-      <%= principals_check_box_tags 'membership[user_ids][]', principals %>
+    <div id="principals_for_new_member">
+      <%= render_principals_for_new_members(@project) %>
     </div>
 
     <p><%= l(:label_role_plural) %>: