mirror of
https://github.com/redmine/redmine.git
synced 2026-05-07 13:27:40 +02:00
User groups feature initial commit.
git-svn-id: http://redmine.rubyforge.org/svn/branches/work@1373 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
@@ -1,22 +1,23 @@
|
||||
<%= error_messages_for 'member' %>
|
||||
<% roles = Role.find_all_givable %>
|
||||
<% users = User.find_active(:all).sort - @project.users %>
|
||||
<% users = User.find_active(:all).sort - @project.users.find(:all, :conditions => 'inherited_from IS NULL') %>
|
||||
<% groups = Group.find(:all, :order => 'name') - @project.memberships.collect(&:principal) %>
|
||||
<% # members sorted by role position
|
||||
members = @project.members.find(:all, :include => [:role, :user]).sort %>
|
||||
members = @project.memberships.select {|m| m.inherited_from.nil? }.sort #members.find(:all, :include => [:role, :user]).sort %>
|
||||
|
||||
<% if members.any? %>
|
||||
<table class="list">
|
||||
<table class="list members">
|
||||
<thead>
|
||||
<th><%= l(:label_user) %></th>
|
||||
<th><%= l(:label_member) %></th>
|
||||
<th><%= l(:label_role) %></th>
|
||||
<th style="width:15%"></th>
|
||||
</thead>
|
||||
<tbody>
|
||||
<% members.each do |member| %>
|
||||
<% next if member.new_record? %>
|
||||
<tr class="<%= cycle 'odd', 'even' %>">
|
||||
<td><%= member.name %></td>
|
||||
<td align="center">
|
||||
<tr class="<%= cycle 'odd', 'even' %> <%= member.principal.class.name.downcase %>">
|
||||
<td class="name"><%=h member %></td>
|
||||
<td class="role">
|
||||
<% if authorize_for('members', 'edit') %>
|
||||
<% remote_form_for(:member, member, :url => {:controller => 'members', :action => 'edit', :id => member}, :method => :post) do |f| %>
|
||||
<%= f.select :role_id, roles.collect{|role| [role.name, role.id]}, {}, :class => "small" %>
|
||||
@@ -38,10 +39,10 @@
|
||||
<p class="nodata"><%= l(:label_no_data) %></p>
|
||||
<% end %>
|
||||
|
||||
<% if authorize_for('members', 'new') && !users.empty? %>
|
||||
<% if authorize_for('members', 'new') && !(users.empty? && groups.empty?) %>
|
||||
<p><%=l(:label_member_new)%></p>
|
||||
<% remote_form_for(:member, @member, :url => {:controller => 'members', :action => 'new', :id => @project}, :method => :post) do |f| %>
|
||||
<p><label for="member_user_id"><%=l(:label_member_new)%></label><br />
|
||||
<%= f.select :user_id, users.collect{|user| [user.name, user.id]} %>
|
||||
<p><%= principal_select_tag(groups, users) %>
|
||||
<%= l(:label_role) %>: <%= f.select :role_id, roles.collect{|role| [role.name, role.id]}, :selected => nil %>
|
||||
<%= submit_tag l(:button_add) %></p>
|
||||
<% end %>
|
||||
|
||||
Reference in New Issue
Block a user