Revision 1298:4f746d8966dd app/views/projects/settings

View differences:

app/views/projects/settings/_members.html.erb
1 1
<%= error_messages_for 'member' %>
2 2
<% roles = Role.find_all_givable
3
   members = @project.member_principals.find(:all, :include => [:roles, :principal]).sort %>
3
   members = @project.member_principals.includes(:roles, :principal).all.sort %>
4 4

  
5 5
<div class="splitcontentleft">
6 6
<% if members.any? %>
......
51 51
<% end %>
52 52
</div>
53 53

  
54
<% principals = Principal.active.not_member_of(@project).all(:limit => 100, :order => 'type, login, lastname ASC') %>
55

  
56 54
<div class="splitcontentright">
57
<% if roles.any? && principals.any? %>
55
<% if roles.any? %>
58 56
  <%= form_for(@member, {:as => :membership, :url => project_memberships_path(@project), :remote => true, :method => :post}) do |f| %>
59 57
    <fieldset><legend><%=l(:label_member_new)%></legend>
60 58

  
61 59
    <p><%= label_tag "principal_search", l(:label_principal_search) %><%= text_field_tag 'principal_search', nil %></p>
62
    <%= javascript_tag "observeSearchfield('principal_search', 'principals', '#{ escape_javascript autocomplete_project_memberships_path(@project) }')" %>
60
    <%= javascript_tag "observeSearchfield('principal_search', null, '#{ escape_javascript autocomplete_project_memberships_path(@project, :format => 'js') }')" %>
63 61

  
64
    <div id="principals">
65
      <%= principals_check_box_tags 'membership[user_ids][]', principals %>
62
    <div id="principals_for_new_member">
63
      <%= render_principals_for_new_members(@project) %>
66 64
    </div>
67 65

  
68 66
    <p><%= l(:label_role_plural) %>:
app/views/projects/settings/_modules.html.erb
3 3
            :html => {:id => 'modules-form',
4 4
                      :method => :post} do |f| %>
5 5

  
6
<div class="box">
7
<fieldset>
6
<fieldset class="box">
8 7
<legend><%= l(:text_select_project_modules) %></legend>
9 8

  
10 9
<% Redmine::AccessControl.available_project_modules.each do |m| %>
......
12 11
 <%= l_or_humanize(m, :prefix => "project_module_") %></label></p>
13 12
<% end %>
14 13
</fieldset>
15
</div>
14
<p><%= check_all_links 'modules-form' %></p>
16 15

  
17
<p><%= check_all_links 'modules-form' %></p>
18 16
<p><%= submit_tag l(:button_save) %></p>
19 17

  
20 18
<% end %>

Also available in: Unified diff