jro_apps/redmine Commit - r2755:770745714544

User groups branch merged....

Jean-Philippe Lang -

r2755:770745714544

parent child

Context file:

r2755:770745714544

Expand all files

app/controllers/groups_controller.rb created 644 +162 0

@@ -0,0 +1,162
	1	# Redmine - project management software
	2	# Copyright (C) 2006-2009 Jean-Philippe Lang
	3	#
	4	# This program is free software; you can redistribute it and/or
	5	# modify it under the terms of the GNU General Public License
	6	# as published by the Free Software Foundation; either version 2
	7	# of the License, or (at your option) any later version.
	8	#
	9	# This program is distributed in the hope that it will be useful,
	10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	12	# GNU General Public License for more details.
	13	#
	14	# You should have received a copy of the GNU General Public License
	15	# along with this program; if not, write to the Free Software
	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	17
	18	class GroupsController < ApplicationController
	19	layout 'base'
	20	before_filter :require_admin
	21
	22	helper :custom_fields
	23
	24	# GET /groups
	25	# GET /groups.xml
	26	def index
	27	@groups = Group.find(:all, :order => 'lastname')
	28
	29	respond_to do \|format\|
	30	format.html # index.html.erb
	31	format.xml { render :xml => @groups }
	32	end
	33	end
	34
	35	# GET /groups/1
	36	# GET /groups/1.xml
	37	def show
	38	@group = Group.find(params[:id])
	39
	40	respond_to do \|format\|
	41	format.html # show.html.erb
	42	format.xml { render :xml => @group }
	43	end
	44	end
	45
	46	# GET /groups/new
	47	# GET /groups/new.xml
	48	def new
	49	@group = Group.new
	50
	51	respond_to do \|format\|
	52	format.html # new.html.erb
	53	format.xml { render :xml => @group }
	54	end
	55	end
	56
	57	# GET /groups/1/edit
	58	def edit
	59	@group = Group.find(params[:id])
	60	end
	61
	62	# POST /groups
	63	# POST /groups.xml
	64	def create
	65	@group = Group.new(params[:group])
	66
	67	respond_to do \|format\|
	68	if @group.save
	69	flash[:notice] = l(:notice_successful_create)
	70	format.html { redirect_to(groups_path) }
	71	format.xml { render :xml => @group, :status => :created, :location => @group }
	72	else
	73	format.html { render :action => "new" }
	74	format.xml { render :xml => @group.errors, :status => :unprocessable_entity }
	75	end
	76	end
	77	end
	78
	79	# PUT /groups/1
	80	# PUT /groups/1.xml
	81	def update
	82	@group = Group.find(params[:id])
	83
	84	respond_to do \|format\|
	85	if @group.update_attributes(params[:group])
	86	flash[:notice] = l(:notice_successful_update)
	87	format.html { redirect_to(groups_path) }
	88	format.xml { head :ok }
	89	else
	90	format.html { render :action => "edit" }
	91	format.xml { render :xml => @group.errors, :status => :unprocessable_entity }
	92	end
	93	end
	94	end
	95
	96	# DELETE /groups/1
	97	# DELETE /groups/1.xml
	98	def destroy
	99	@group = Group.find(params[:id])
	100	@group.destroy
	101
	102	respond_to do \|format\|
	103	format.html { redirect_to(groups_url) }
	104	format.xml { head :ok }
	105	end
	106	end
	107
	108	def add_users
	109	@group = Group.find(params[:id])
	110	users = User.find_all_by_id(params[:user_ids])
	111	@group.users << users if request.post?
	112	respond_to do \|format\|
	113	format.html { redirect_to :controller => 'groups', :action => 'edit', :id => @group, :tab => 'users' }
	114	format.js {
	115	render(:update) {\|page\|
	116	page.replace_html "tab-content-users", :partial => 'groups/users'
	117	users.each {\|user\| page.visual_effect(:highlight, "user-#{user.id}") }
	118	}
	119	}
	120	end
	121	end
	122
	123	def remove_user
	124	@group = Group.find(params[:id])
	125	@group.users.delete(User.find(params[:user_id])) if request.post?
	126	respond_to do \|format\|
	127	format.html { redirect_to :controller => 'groups', :action => 'edit', :id => @group, :tab => 'users' }
	128	format.js { render(:update) {\|page\| page.replace_html "tab-content-users", :partial => 'groups/users'} }
	129	end
	130	end
	131
	132	def autocomplete_for_user
	133	@group = Group.find(params[:id])
	134	@users = User.active.like(params[:q]).find(:all, :limit => 100) - @group.users
	135	render :layout => false
	136	end
	137
	138	def edit_membership
	139	@group = Group.find(params[:id])
	140	@membership = params[:membership_id] ? Member.find(params[:membership_id]) : Member.new(:principal => @group)
	141	@membership.attributes = params[:membership]
	142	@membership.save if request.post?
	143	respond_to do \|format\|
	144	format.html { redirect_to :controller => 'groups', :action => 'edit', :id => @group, :tab => 'memberships' }
	145	format.js {
	146	render(:update) {\|page\|
	147	page.replace_html "tab-content-memberships", :partial => 'groups/memberships'
	148	page.visual_effect(:highlight, "member-#{@membership.id}")
	149	}
	150	}
	151	end
	152	end
	153
	154	def destroy_membership
	155	@group = Group.find(params[:id])
	156	Member.find(params[:membership_id]).destroy if request.post?
	157	respond_to do \|format\|
	158	format.html { redirect_to :controller => 'groups', :action => 'edit', :id => @group, :tab => 'memberships' }
	159	format.js { render(:update) {\|page\| page.replace_html "tab-content-memberships", :partial => 'groups/memberships'} }
	160	end
	161	end
	162	end

app/helpers/groups_helper.rb created 644 +34 0

@@ -0,0 +1,34
	1	# Redmine - project management software
	2	# Copyright (C) 2006-2009 Jean-Philippe Lang
	3	#
	4	# This program is free software; you can redistribute it and/or
	5	# modify it under the terms of the GNU General Public License
	6	# as published by the Free Software Foundation; either version 2
	7	# of the License, or (at your option) any later version.
	8	#
	9	# This program is distributed in the hope that it will be useful,
	10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	12	# GNU General Public License for more details.
	13	#
	14	# You should have received a copy of the GNU General Public License
	15	# along with this program; if not, write to the Free Software
	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	17
	18	module GroupsHelper
	19	# Options for the new membership projects combo-box
	20	def options_for_membership_project_select(user, projects)
	21	options = content_tag('option', "--- #{l(:actionview_instancetag_blank_option)} ---")
	22	options << project_tree_options_for_select(projects) do \|p\|
	23	{:disabled => (user.projects.include?(p))}
	24	end
	25	options
	26	end
	27
	28	def group_settings_tabs
	29	tabs = [{:name => 'general', :partial => 'groups/general', :label => :label_general},
	30	{:name => 'users', :partial => 'groups/users', :label => :label_user_plural},
	31	{:name => 'memberships', :partial => 'groups/memberships', :label => :label_project_plural}
	32	]
	33	end
	34	end

app/models/group.rb created 644 +48 0

@@ -0,0 +1,48
	1	# Redmine - project management software
	2	# Copyright (C) 2006-2009 Jean-Philippe Lang
	3	#
	4	# This program is free software; you can redistribute it and/or
	5	# modify it under the terms of the GNU General Public License
	6	# as published by the Free Software Foundation; either version 2
	7	# of the License, or (at your option) any later version.
	8	#
	9	# This program is distributed in the hope that it will be useful,
	10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	12	# GNU General Public License for more details.
	13	#
	14	# You should have received a copy of the GNU General Public License
	15	# along with this program; if not, write to the Free Software
	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	17
	18	class Group < Principal
	19	has_and_belongs_to_many :users, :after_add => :user_added,
	20	:after_remove => :user_removed
	21
	22	acts_as_customizable
	23
	24	validates_presence_of :lastname
	25	validates_uniqueness_of :lastname, :case_sensitive => false
	26	validates_length_of :lastname, :maximum => 30
	27
	28	def to_s
	29	lastname.to_s
	30	end
	31
	32	def user_added(user)
	33	members.each do \|member\|
	34	user_member = Member.find_by_project_id_and_user_id(member.project_id, user.id) \|\| Member.new(:project_id => member.project_id, :user_id => user.id)
	35	member.member_roles.each do \|member_role\|
	36	user_member.member_roles << MemberRole.new(:role => member_role.role, :inherited_from => member_role.id)
	37	end
	38	user_member.save!
	39	end
	40	end
	41
	42	def user_removed(user)
	43	members.each do \|member\|
	44	MemberRole.find(:all, :include => :member,
	45	:conditions => ["#{Member.table_name}.user_id = ? AND #{MemberRole.table_name}.inherited_from IN (?)", user.id, member.member_role_ids]).each(&:destroy)
	46	end
	47	end
	48	end

app/models/group_custom_field.rb created 644 +22 0

@@ -0,0 +1,22
	1	# Redmine - project management software
	2	# Copyright (C) 2006-2009 Jean-Philippe Lang
	3	#
	4	# This program is free software; you can redistribute it and/or
	5	# modify it under the terms of the GNU General Public License
	6	# as published by the Free Software Foundation; either version 2
	7	# of the License, or (at your option) any later version.
	8	#
	9	# This program is distributed in the hope that it will be useful,
	10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	12	# GNU General Public License for more details.
	13	#
	14	# You should have received a copy of the GNU General Public License
	15	# along with this program; if not, write to the Free Software
	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	17
	18	class GroupCustomField < CustomField
	19	def type_name
	20	:label_group_plural
	21	end
	22	end

app/models/principal.rb created 644 +38 0

@@ -0,0 +1,38
	1	# Redmine - project management software
	2	# Copyright (C) 2006-2009 Jean-Philippe Lang
	3	#
	4	# This program is free software; you can redistribute it and/or
	5	# modify it under the terms of the GNU General Public License
	6	# as published by the Free Software Foundation; either version 2
	7	# of the License, or (at your option) any later version.
	8	#
	9	# This program is distributed in the hope that it will be useful,
	10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	12	# GNU General Public License for more details.
	13	#
	14	# You should have received a copy of the GNU General Public License
	15	# along with this program; if not, write to the Free Software
	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	17
	18	class Principal < ActiveRecord::Base
	19	set_table_name 'users'
	20
	21	has_many :members, :foreign_key => 'user_id', :dependent => :destroy
	22	has_many :memberships, :class_name => 'Member', :foreign_key => 'user_id', :include => [ :project, :roles ], :conditions => "#{Project.table_name}.status=#{Project::STATUS_ACTIVE}", :order => "#{Project.table_name}.name"
	23	has_many :projects, :through => :memberships
	24
	25	# Groups and active users
	26	named_scope :active, :conditions => "#{Principal.table_name}.type='Group' OR (#{Principal.table_name}.type='User' AND #{Principal.table_name}.status = 1)"
	27
	28	named_scope :like, lambda {\|q\|
	29	s = "%#{q.to_s.strip.downcase}%"
	30	{:conditions => ["LOWER(login) LIKE ? OR LOWER(firstname) LIKE ? OR LOWER(lastname) LIKE ?", s, s, s],
	31	:order => 'type, login, lastname, firstname'
	32	}
	33	}
	34
	35	def <=>(principal)
	36	self.to_s.downcase <=> principal.to_s.downcase
	37	end
	38	end

app/views/groups/_form.html.erb created 644 +8 0

@@ -0,0 +1,8
	1	<%= error_messages_for :group %>
	2
	3	<div class="box tabular">
	4	<p><%= f.text_field :lastname, :label => :field_name %></p>
	5	<% @group.custom_field_values.each do \|value\| %>
	6	<p><%= custom_field_tag_with_label :group, value %></p>
	7	<% end %>
	8	</div>

app/views/groups/_general.html.erb created 644 +4 0

@@ -0,0 +1,4
	1	<% labelled_tabular_form_for :group, @group, :url => { :controller => 'group', :action => 'update', :tab => nil } do \|f\| %>
	2	<%= render :partial => 'form', :locals => { :f => f } %>
	3	<%= submit_tag l(:button_save) %>
	4	<% end %>

app/views/groups/_memberships.html.erb created 644 +56 0

@@ -0,0 +1,56
	1	<% roles = Role.find_all_givable %>
	2	<% projects = Project.active.find(:all, :order => 'lft') %>
	3
	4	<div class="splitcontentleft">
	5	<% if @group.memberships.any? %>
	6	<table class="list memberships">
	7	<thead>
	8	<th><%= l(:label_project) %></th>
	9	<th><%= l(:label_role_plural) %></th>
	10	<th style="width:15%"></th>
	11	</thead>
	12	<tbody>
	13	<% @group.memberships.each do \|membership\| %>
	14	<% next if membership.new_record? %>
	15	<tr id="member-<%= membership.id %>" class="<%= cycle 'odd', 'even' %> class">
	16	<td class="project"><%=h membership.project %></td>
	17	<td class="roles">
	18	<span id="member-<%= membership.id %>-roles"><%=h membership.roles.sort.collect(&:to_s).join(', ') %></span>
	19	<% remote_form_for(:membership, :url => { :action => 'edit_membership', :id => @group, :membership_id => membership },
	20	:html => { :id => "member-#{membership.id}-roles-form", :style => 'display:none;'}) do %>
	21	<p><% roles.each do \|role\| %>
	22	<label><%= check_box_tag 'membership[role_ids][]', role.id, membership.roles.include?(role) %> <%=h role %></label><br />
	23	<% end %></p>
	24	<p><%= submit_tag l(:button_change) %>
	25	<%= link_to_function l(:button_cancel), "$('member-#{membership.id}-roles').show(); $('member-#{membership.id}-roles-form').hide(); return false;" %></p>
	26	<% end %>
	27	</td>
	28	<td class="buttons">
	29	<%= link_to_function l(:button_edit), "$('member-#{membership.id}-roles').hide(); $('member-#{membership.id}-roles-form').show(); return false;", :class => 'icon icon-edit' %>
	30	<%= link_to_remote l(:button_delete), { :url => { :controller => 'groups', :action => 'destroy_membership', :id => @group, :membership_id => membership },
	31	:method => :post },
	32	:class => 'icon icon-del' %>
	33	</td>
	34	</tr>
	35	</tbody>
	36	<% end; reset_cycle %>
	37	</table>
	38	<% else %>
	39	<p class="nodata"><%= l(:label_no_data) %></p>
	40	<% end %>
	41	</div>
	42
	43	<div class="splitcontentright">
	44	<% if projects.any? %>
	45	<fieldset><legend><%=l(:label_project_new)%></legend>
	46	<% remote_form_for(:membership, :url => { :action => 'edit_membership', :id => @group }) do %>
	47	<%= select_tag 'membership[project_id]', options_for_membership_project_select(@group, projects) %>
	48	<p><%= l(:label_role_plural) %>:
	49	<% roles.each do \|role\| %>
	50	<label><%= check_box_tag 'membership[role_ids][]', role.id %> <%=h role %></label>
	51	<% end %></p>
	52	<p><%= submit_tag l(:button_add) %></p>
	53	<% end %>
	54	</fieldset>
	55	<% end %>
	56	</div>

app/views/groups/_users.html.erb created 644 +49 0

@@ -0,0 +1,49
	1	<div class="splitcontentleft">
	2	<% if @group.users.any? %>
	3	<table class="list users">
	4	<thead>
	5	<th><%= l(:label_user) %></th>
	6	<th style="width:15%"></th>
	7	</thead>
	8	<tbody>
	9	<% @group.users.sort.each do \|user\| %>
	10	<tr id="user-<%= user.id %>" class="<%= cycle 'odd', 'even' %>">
	11	<td class="user"><%= link_to_user user %></td>
	12	<td class="buttons">
	13	<%= link_to_remote l(:button_delete), { :url => { :controller => 'groups', :action => 'remove_user', :id => @group, :user_id => user },
	14	:method => :post },
	15	:class => 'icon icon-del' %>
	16	</td>
	17	</tr>
	18	<% end %>
	19	</tbody>
	20	</table>
	21	<% else %>
	22	<p class="nodata"><%= l(:label_no_data) %></p>
	23	<% end %>
	24	</div>
	25
	26	<div class="splitcontentright">
	27	<% users = User.active.find(:all, :limit => 100) - @group.users %>
	28	<% if users.any? %>
	29	<% remote_form_for(:group, @group, :url => {:controller => 'groups', :action => 'add_users', :id => @group}, :method => :post) do \|f\| %>
	30	<fieldset><legend><%=l(:label_user_new)%></legend>
	31
	32	<p><%= text_field_tag 'user_search', nil, :size => "40" %></p>
	33	<%= observe_field(:user_search,
	34	:frequency => 0.5,
	35	:update => :users,
	36	:url => { :controller => 'groups', :action => 'autocomplete_for_user', :id => @group },
	37	:with => 'q')
	38	%>
	39
	40	<div id="users">
	41	<%= principals_check_box_tags 'user_ids[]', users %>
	42	</div>
	43
	44	<p><%= submit_tag l(:button_add) %></p>
	45	</fieldset>
	46	<% end %>
	47	<% end %>
	48
	49	</div>

app/views/groups/autocomplete_for_user.html.erb created 644 +1 0

	@@ -0,0 +1,1
				1	<%= principals_check_box_tags 'user_ids[]', @users %>

app/views/groups/edit.html.erb created 644 +23 0

@@ -0,0 +1,23
	1	<h2><%= link_to l(:label_group_plural), groups_path %> » <%= h(@group) %></h2>
	2
	3	<% selected_tab = params[:tab] ? params[:tab].to_s : group_settings_tabs.first[:name] %>
	4
	5	<div class="tabs">
	6	<ul>
	7	<% group_settings_tabs.each do \|tab\| -%>
	8	<li><%= link_to l(tab[:label]), { :tab => tab[:name] },
	9	:id => "tab-#{tab[:name]}",
	10	:class => (tab[:name] != selected_tab ? nil : 'selected'),
	11	:onclick => "showTab('#{tab[:name]}'); this.blur(); return false;" %></li>
	12	<% end -%>
	13	</ul>
	14	</div>
	15
	16	<% group_settings_tabs.each do \|tab\| -%>
	17	<%= content_tag('div', render(:partial => tab[:partial]),
	18	:id => "tab-content-#{tab[:name]}",
	19	:style => (tab[:name] != selected_tab ? 'display:none' : nil),
	20	:class => 'tab-content') %>
	21	<% end -%>
	22
	23	<% html_title(l(:label_group), @group, l(:label_administration)) -%>

app/views/groups/index.html.erb created 644 +25 0

@@ -0,0 +1,25
	1	<div class="contextual">
	2	<%= link_to l(:label_group_new), new_group_path, :class => 'icon icon-add' %>
	3	</div>
	4
	5	<h2><%= l(:label_group_plural) %></h2>
	6
	7	<% if @groups.any? %>
	8	<table class="list groups">
	9	<thead><tr>
	10	<th><%=l(:label_group)%></th>
	11	<th><%=l(:label_user_plural)%></th>
	12	<th></th>
	13	</tr></thead>
	14	<tbody>
	15	<% @groups.each do \|group\| %>
	16	<tr class="<%= cycle 'odd', 'even' %>">
	17	<td><%= link_to h(group), :action => 'edit', :id => group %></td>
	18	<td align="center"><%= group.users.size %></td>
	19	<td class="buttons"><%= link_to l(:button_delete), group, :confirm => l(:text_are_you_sure), :method => :delete, :class => 'icon icon-del' %></td>
	20	</tr>
	21	<% end %>
	22	</table>
	23	<% else %>
	24	<p class="nodata"><%= l(:label_no_data) %></p>
	25	<% end %>

app/views/groups/new.html.erb created 644 +8 0

@@ -0,0 +1,8
	1	<h2><%= link_to l(:label_group_plural), groups_path %> » <%= l(:label_group_new) %></h2>
	2
	3	<%= error_messages_for :group %>
	4
	5	<% form_for(@group, :builder => TabularFormBuilder, :lang => current_language) do \|f\| %>
	6	<%= render :partial => 'form', :locals => { :f => f } %>
	7	<p><%= f.submit l(:button_create) %></p>
	8	<% end %>

app/views/groups/show.html.erb created 644 +7 0

@@ -0,0 +1,7
	1	<h2><%= link_to l(:label_group_plural), groups_path %> » <%=h @group %></h2>
	2
	3	<ul>
	4	<% @group.users.each do \|user\| %>
	5	<li><%=h user %></li>
	6	<% end %>
	7	</ul>

app/views/members/autocomplete_for_member.rhtml created 644 +1 0

	@@ -0,0 +1,1
				1	<%= principals_check_box_tags 'member[user_ids][]', @principals %> No newline at end of file

app/views/users/_groups.rhtml created 644 +9 0

@@ -0,0 +1,9
	1	<% form_for(:user, :url => { :action => 'edit' }) do %>
	2	<div class="box">
	3	<% Group.all.each do \|group\| %>
	4	<label><%= check_box_tag 'user[group_ids][]', group.id, @user.groups.include?(group) %> <%=h group %></label><br />
	5	<% end %>
	6	<%= hidden_field_tag 'user[group_ids][]', '' %>
	7	</div>
	8	<%= submit_tag l(:button_save) %>
	9	<% end %>

db/migrate/20090704172350_populate_users_type.rb created 644 +8 0

@@ -0,0 +1,8
	1	class PopulateUsersType < ActiveRecord::Migration
	2	def self.up
	3	Principal.update_all("type = 'User'", "type IS NULL")
	4	end
	5
	6	def self.down
	7	end
	8	end

db/migrate/20090704172355_create_groups_users.rb created 644 +13 0

@@ -0,0 +1,13
	1	class CreateGroupsUsers < ActiveRecord::Migration
	2	def self.up
	3	create_table :groups_users, :id => false do \|t\|
	4	t.column :group_id, :integer, :null => false
	5	t.column :user_id, :integer, :null => false
	6	end
	7	add_index :groups_users, [:group_id, :user_id], :unique => true, :name => :groups_users_ids
	8	end
	9
	10	def self.down
	11	drop_table :groups_users
	12	end
	13	end

db/migrate/20090704172358_add_member_roles_inherited_from.rb created 644 +9 0

@@ -0,0 +1,9
	1	class AddMemberRolesInheritedFrom < ActiveRecord::Migration
	2	def self.up
	3	add_column :member_roles, :inherited_from, :integer
	4	end
	5
	6	def self.down
	7	remove_column :member_roles, :inherited_from
	8	end
	9	end

public/images/22x22/groups.png created 644 binary 0 0

NO CONTENT: new file 100644, binary diff hidden

test/fixtures/groups_users.yml created 644 +5 0

@@ -0,0 +1,5
	1	---
	2	groups_users_001:
	3	group_id: 10
	4	user_id: 8
	5	No newline at end of file

test/functional/groups_controller_test.rb created 644 +107 0

@@ -0,0 +1,107
	1	# Redmine - project management software
	2	# Copyright (C) 2006-2009 Jean-Philippe Lang
	3	#
	4	# This program is free software; you can redistribute it and/or
	5	# modify it under the terms of the GNU General Public License
	6	# as published by the Free Software Foundation; either version 2
	7	# of the License, or (at your option) any later version.
	8	#
	9	# This program is distributed in the hope that it will be useful,
	10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	12	# GNU General Public License for more details.
	13	#
	14	# You should have received a copy of the GNU General Public License
	15	# along with this program; if not, write to the Free Software
	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	17
	18	require File.dirname(__FILE__) + '/../test_helper'
	19	require 'groups_controller'
	20
	21	# Re-raise errors caught by the controller.
	22	class GroupsController; def rescue_action(e) raise e end; end
	23
	24	class GroupsControllerTest < Test::Unit::TestCase
	25	fixtures :projects, :users, :members, :member_roles
	26
	27	def setup
	28	@controller = GroupsController.new
	29	@request = ActionController::TestRequest.new
	30	@response = ActionController::TestResponse.new
	31	User.current = nil
	32	@request.session[:user_id] = 1
	33	end
	34
	35	def test_index
	36	get :index
	37	assert_response :success
	38	assert_template 'index'
	39	end
	40
	41	def test_show
	42	get :show, :id => 10
	43	assert_response :success
	44	assert_template 'show'
	45	end
	46
	47	def test_new
	48	get :new
	49	assert_response :success
	50	assert_template 'new'
	51	end
	52
	53	def test_create
	54	assert_difference 'Group.count' do
	55	post :create, :group => {:lastname => 'New group'}
	56	end
	57	assert_redirected_to 'groups'
	58	end
	59
	60	def test_edit
	61	get :edit, :id => 10
	62	assert_response :success
	63	assert_template 'edit'
	64	end
	65
	66	def test_update
	67	post :update, :id => 10
	68	assert_redirected_to 'groups'
	69	end
	70
	71	def test_destroy
	72	assert_difference 'Group.count', -1 do
	73	post :destroy, :id => 10
	74	end
	75	assert_redirected_to 'groups'
	76	end
	77
	78	def test_add_users
	79	assert_difference 'Group.find(10).users.count', 2 do
	80	post :add_users, :id => 10, :user_ids => ['2', '3']
	81	end
	82	end
	83
	84	def test_remove_user
	85	assert_difference 'Group.find(10).users.count', -1 do
	86	post :remove_user, :id => 10, :user_id => '8'
	87	end
	88	end
	89
	90	def test_new_membership
	91	assert_difference 'Group.find(10).members.count' do
	92	post :edit_membership, :id => 10, :membership => { :project_id => 2, :role_ids => ['1', '2']}
	93	end
	94	end
	95
	96	def test_edit_membership
	97	assert_no_difference 'Group.find(10).members.count' do
	98	post :edit_membership, :id => 10, :membership_id => 6, :membership => { :role_ids => ['1', '3']}
	99	end
	100	end
	101
	102	def test_destroy_membership
	103	assert_difference 'Group.find(10).members.count', -1 do
	104	post :destroy_membership, :id => 10, :membership_id => 6
	105	end
	106	end
	107	end

test/unit/group_test.rb created 644 +77 0

@@ -0,0 +1,77
	1	# Redmine - project management software
	2	# Copyright (C) 2006-2009 Jean-Philippe Lang
	3	#
	4	# This program is free software; you can redistribute it and/or
	5	# modify it under the terms of the GNU General Public License
	6	# as published by the Free Software Foundation; either version 2
	7	# of the License, or (at your option) any later version.
	8	#
	9	# This program is distributed in the hope that it will be useful,
	10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	12	# GNU General Public License for more details.
	13	#
	14	# You should have received a copy of the GNU General Public License
	15	# along with this program; if not, write to the Free Software
	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	17
	18	require File.dirname(__FILE__) + '/../test_helper'
	19
	20	class GroupTest < Test::Unit::TestCase
	21	fixtures :all
	22
	23	def test_create
	24	g = Group.new(:lastname => 'New group')
	25	assert g.save
	26	end
	27
	28	def test_roles_given_to_new_user
	29	group = Group.find(11)
	30	user = User.find(9)
	31	project = Project.first
	32
	33	Member.create!(:principal => group, :project => project, :role_ids => [1, 2])
	34	group.users << user
	35	assert user.member_of?(project)
	36	end
	37
	38	def test_roles_given_to_existing_user
	39	group = Group.find(11)
	40	user = User.find(9)
	41	project = Project.first
	42
	43	group.users << user
	44	m = Member.create!(:principal => group, :project => project, :role_ids => [1, 2])
	45	assert user.member_of?(project)
	46	end
	47
	48	def test_roles_updated
	49	group = Group.find(11)
	50	user = User.find(9)
	51	project = Project.first
	52	group.users << user
	53	m = Member.create!(:principal => group, :project => project, :role_ids => [1])
	54	assert_equal [1], user.reload.roles_for_project(project).collect(&:id).sort
	55
	56	m.role_ids = [1, 2]
	57	assert_equal [1, 2], user.reload.roles_for_project(project).collect(&:id).sort
	58
	59	m.role_ids = [2]
	60	assert_equal [2], user.reload.roles_for_project(project).collect(&:id).sort
	61
	62	m.role_ids = [1]
	63	assert_equal [1], user.reload.roles_for_project(project).collect(&:id).sort
	64	end
	65
	66	def test_roles_removed_when_removing_group_membership
	67	assert User.find(8).member_of?(Project.find(5))
	68	Member.find_by_project_id_and_user_id(5, 10).destroy
	69	assert !User.find(8).member_of?(Project.find(5))
	70	end
	71
	72	def test_roles_removed_when_removing_user_from_group
	73	assert User.find(8).member_of?(Project.find(5))
	74	User.find(8).groups.clear
	75	assert !User.find(8).member_of?(Project.find(5))
	76	end
	77	end

app/controllers/members_controller.rb +8 -8

             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class MembersController < ApplicationController
-              before_filter :find_member, :except => [:new, :autocomplete_for_member_login]
+              before_filter :find_member, :except => [:new, :autocomplete_for_member]
-              before_filter :find_project, :only => [:new, :autocomplete_for_member_login]
+              before_filter :find_project, :only => [:new, :autocomplete_for_member]
               before_filter :authorize
               def new
               end
               def destroy
-                @member.destroy
+                if request.post? && @member.deletable?
-            	respond_to do |format|
+                  @member.destroy
+                end
+                respond_to do |format|
                   format.html { redirect_to :controller => 'projects', :action => 'settings', :tab => 'members', :id => @project }
                   format.js { render(:update) {|page| page.replace_html "tab-content-members", :partial => 'projects/settings/members'} }
                 end
               end
-              def autocomplete_for_member_login
+              def autocomplete_for_member
-                @users = User.active.find(:all, :conditions => ["LOWER(login) LIKE ? OR LOWER(firstname) LIKE ? OR LOWER(lastname) LIKE ?", "#{params[:user]}%", "#{params[:user]}%", "#{params[:user]}%"],
+                @principals = Principal.active.like(params[:q]).find(:all, :limit => 100) - @project.principals
-                                                :limit => 10,
-                                                :order => 'login ASC') - @project.users
                 render :layout => false
               end

app/controllers/users_controller.rb +10 -5

                   if @user.save
                     Mailer.deliver_account_information(@user, params[:password]) if params[:send_information]
                     flash[:notice] = l(:notice_successful_create)
-                    redirect_to :action => 'list'
+                    redirect_to :controller => 'users', :action => 'edit', :id => @user
                   end
                 end
                 @auth_sources = AuthSource.find(:all)
                   @user.admin = params[:user][:admin] if params[:user][:admin]
                   @user.login = params[:user][:login] if params[:user][:login]
                   @user.password, @user.password_confirmation = params[:password], params[:password_confirmation] unless params[:password].nil? or params[:password].empty? or @user.auth_source_id
+                  @user.group_ids = params[:user][:group_ids] if params[:user][:group_ids]
                   @user.attributes = params[:user]
                   # Was the account actived ? (do it before User#save clears the change)
                   was_activated = (@user.status_change == [User::STATUS_REGISTERED, User::STATUS_ACTIVE])
                       Mailer.deliver_account_information(@user, params[:password])
                     end
                     flash[:notice] = l(:notice_successful_update)
-                    # Give a string to redirect_to otherwise it would use status param as the response code
+                    redirect_to :back
-                    redirect_to(url_for(:action => 'list', :status => params[:status], :page => params[:page]))
                   end
                 end
                 @auth_sources = AuthSource.find(:all)
                 @membership ||= Member.new
+              rescue ::ActionController::RedirectBackError
+                redirect_to :controller => 'users', :action => 'edit', :id => @user
               end
               def edit_membership
                 @user = User.find(params[:id])
-                @membership = params[:membership_id] ? Member.find(params[:membership_id]) : Member.new(:user => @user)
+                @membership = params[:membership_id] ? Member.find(params[:membership_id]) : Member.new(:principal => @user)
                 @membership.attributes = params[:membership]
                 @membership.save if request.post?
                 respond_to do |format|
               def destroy_membership
                 @user = User.find(params[:id])
-                Member.find(params[:membership_id]).destroy if request.post?
+                @membership = Member.find(params[:membership_id])
+                if request.post? && @membership.deletable?
+                  @membership.destroy
+                end
                 respond_to do |format|
                   format.html { redirect_to :controller => 'users', :action => 'edit', :id => @user, :tab => 'memberships' }
                   format.js { render(:update) {|page| page.replace_html "tab-content-memberships", :partial => 'users/memberships'} }

app/helpers/application_helper.rb +13 -1

               # Display a link to user's account page
               def link_to_user(user, options={})
-                (user && !user.anonymous?) ? link_to(user.name(options[:format]), :controller => 'account', :action => 'show', :id => user) : 'Anonymous'
+                if user.is_a?(User)
+                  !user.anonymous? ? link_to(user.name(options[:format]), :controller => 'account', :action => 'show', :id => user) : 'Anonymous'
+                else
+                  user.to_s
+                end
               end
               def link_to_issue(issue, options={})
                 end
                 s
               end
+              def principals_check_box_tags(name, principals)
+                s = ''
+                principals.each do |principal|
+                  s << "<label>#{ check_box_tag name, principal.id, false } #{h principal}</label>\n"
+                end
+                s
+              end
               # Truncates and returns the string as a single line
               def truncate_single_line(string, *args)

app/helpers/custom_fields_helper.rb +2 -1

                 tabs = [{:name => 'IssueCustomField', :label => :label_issue_plural},
                         {:name => 'TimeEntryCustomField', :label => :label_spent_time},
                         {:name => 'ProjectCustomField', :label => :label_project_plural},
-                        {:name => 'UserCustomField', :label => :label_user_plural}
+                        {:name => 'UserCustomField', :label => :label_user_plural},
+                        {:name => 'GroupCustomField', :label => :label_group_plural}
                         ]
               end

app/helpers/users_helper.rb +1 0

               def user_settings_tabs
                 tabs = [{:name => 'general', :partial => 'users/general', :label => :label_general},
+                        {:name => 'groups', :partial => 'users/groups', :label => :label_group_plural},
                         {:name => 'memberships', :partial => 'users/memberships', :label => :label_project_plural}
                         ]
               end

app/models/member.rb +24 -14

             class Member < ActiveRecord::Base
               belongs_to :user
-              has_many :member_roles, :dependent => :delete_all
+              belongs_to :principal, :foreign_key => 'user_id'
+              has_many :member_roles, :dependent => :destroy
               has_many :roles, :through => :member_roles
               belongs_to :project
-              validates_presence_of :user, :project
+              validates_presence_of :principal, :project
               validates_uniqueness_of :user_id, :scope => :project_id
               def name
                 self.user.name
               end
-              # Sets user by login
+              alias :base_role_ids= :role_ids=
-              def user_login=(login)
+              def role_ids=(arg)
-                login = login.to_s
+                ids = (arg || []).collect(&:to_i) - [0]
-                unless login.blank?
+                # Keep inherited roles
-                  if (u = User.find_by_login(login))
+                ids += member_roles.select {|mr| !mr.inherited_from.nil?}.collect(&:role_id)
-                    self.user = u
-                  end
+                new_role_ids = ids - role_ids
-                end
+                # Add new roles
+                new_role_ids.each {|id| member_roles << MemberRole.new(:role_id => id) }
+                # Remove roles (Rails' #role_ids= will not trigger MemberRole#on_destroy)
+                member_roles.select {|mr| !ids.include?(mr.role_id)}.each(&:destroy)
               end
               def <=>(member)
                 a, b = roles.sort.first, member.roles.sort.first
-                a == b ? (user <=> member.user) : (a <=> b)
+                a == b ? (principal <=> member.principal) : (a <=> b)
+              end
+              def deletable?
+                member_roles.detect {|mr| mr.inherited_from}.nil?
               end
               def before_destroy
-                # remove category based auto assignments for this member
+                if user
-                IssueCategory.update_all "assigned_to_id = NULL", ["project_id = ? AND assigned_to_id = ?", project.id, user.id]
+                  # remove category based auto assignments for this member
+                  IssueCategory.update_all "assigned_to_id = NULL", ["project_id = ? AND assigned_to_id = ?", project.id, user.id]
+                end
               end
               protected
               def validate
-                errors.add_to_base "Role can't be blank" if roles.empty?
+                errors.add_to_base "Role can't be blank" if member_roles.empty? && roles.empty?
               end
             end

app/models/member_role.rb +27 0

@@ -19,9 +19,36 class MemberRole < ActiveRecord::Base
19	belongs_to :member	19	belongs_to :member
20	belongs_to :role	20	belongs_to :role
21		21
		22	after_destroy :remove_member_if_empty
		23
		24	after_create :add_role_to_group_users
		25	after_destroy :remove_role_from_group_users
		26
22	validates_presence_of :role	27	validates_presence_of :role
23		28
24	def validate	29	def validate
25	errors.add :role_id, :invalid if role && !role.member?	30	errors.add :role_id, :invalid if role && !role.member?
26	end	31	end
		32
		33	private
		34
		35	def remove_member_if_empty
		36	if member.roles.empty?
		37	member.destroy
		38	end
		39	end
		40
		41	def add_role_to_group_users
		42	if member.principal.is_a?(Group)
		43	member.principal.users.each do \|user\|
		44	user_member = Member.find_by_project_id_and_user_id(member.project_id, user.id) \|\| Member.new(:project_id => member.project_id, :user_id => user.id)
		45	user_member.member_roles << MemberRole.new(:role => role, :inherited_from => id)
		46	user_member.save!
		47	end
		48	end
		49	end
		50
		51	def remove_role_from_group_users
		52	MemberRole.find(:all, :conditions => { :inherited_from => id }).each(&:destroy)
		53	end
27	end	54	end

app/models/project.rb +6 -1

               STATUS_ACTIVE     = 1
               STATUS_ARCHIVED   = 9
-              has_many :members, :include => :user, :conditions => "#{User.table_name}.status=#{User::STATUS_ACTIVE}"
+              has_many :members, :include => :user, :conditions => "#{User.table_name}.type='User' AND #{User.table_name}.status=#{User::STATUS_ACTIVE}"
+              has_many :member_principals, :class_name => 'Member',
+                                           :include => :principal,
+                                           :conditions => "#{Principal.table_name}.type='Group' OR (#{Principal.table_name}.type='User' AND #{Principal.table_name}.status=#{User::STATUS_ACTIVE})"
               has_many :users, :through => :members
+              has_many :principals, :through => :member_principals, :source => :principal
               has_many :enabled_modules, :dependent => :delete_all
               has_and_belongs_to_many :trackers, :order => "#{Tracker.table_name}.position"
               has_many :issues, :dependent => :destroy, :order => "#{Issue.table_name}.created_on DESC", :include => [:status, :tracker]

app/models/user.rb +7 -8

-            # redMine - project management software
+            # Redmine - project management software
-            # Copyright (C) 2006-2007  Jean-Philippe Lang
+            # Copyright (C) 2006-2009  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             require "digest/sha1"
-            class User < ActiveRecord::Base
+            class User < Principal
               # Account statuses
               STATUS_ANONYMOUS  = 0
                 :username => '#{login}'
               }
-              has_many :memberships, :class_name => 'Member', :include => [ :project, :roles ], :conditions => "#{Project.table_name}.status=#{Project::STATUS_ACTIVE}", :order => "#{Project.table_name}.name"
+              has_and_belongs_to_many :groups, :after_add => Proc.new {|user, group| group.user_added(user)},
-              has_many :members, :dependent => :delete_all
+                                               :after_remove => Proc.new {|user, group| group.user_removed(user)}
-              has_many :projects, :through => :memberships
               has_many :issue_categories, :foreign_key => 'assigned_to_id', :dependent => :nullify
               has_many :changesets, :dependent => :nullify
               has_one :preference, :dependent => :destroy, :class_name => 'UserPreference'
               attr_accessor :password, :password_confirmation
               attr_accessor :last_before_login_on
               # Prevents unauthorized assignments
-              attr_protected :login, :admin, :password, :password_confirmation, :hashed_password
+              attr_protected :login, :admin, :password, :password_confirmation, :hashed_password, :group_ids
               validates_presence_of :login, :firstname, :lastname, :mail, :if => Proc.new { |user| !user.is_a?(AnonymousUser) }
               validates_uniqueness_of :login, :if => Proc.new { |user| !user.login.blank? }
               end
               private
               # Return password digest
               def self.hash_password(clear_password)
                 Digest::SHA1.hexdigest(clear_password || "")

app/views/admin/index.rhtml +5 0

             <%= link_to l(:label_new), :controller => 'users', :action => 'add' %>
             </p>
+            <p class="icon22 icon22-groups">
+            <%= link_to l(:label_group_plural), :controller => 'groups' %> |
+            <%= link_to l(:label_new), :controller => 'groups', :action => 'new' %>
+            </p>
             <p class="icon22 icon22-role">
             <%= link_to l(:label_role_and_permissions), :controller => 'roles' %>
             </p>

app/views/projects/settings/_members.rhtml +24 -19

             <%= error_messages_for 'member' %>
             <% roles = Role.find_all_givable
-               members = @project.members.find(:all, :include => [:roles, :user]).sort %>
+               members = @project.member_principals.find(:all, :include => [:roles, :principal]).sort %>
             <div class="splitcontentleft">
             <% if members.any? %>
             <table class="list members">
             	<thead>
-            	  <th><%= l(:label_user) %></th>
+            	  <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) %>
             	<% members.each do |member| %>
             	<% next if member.new_record? %>
             	<tr id="member-<%= member.id %>" class="<%= cycle 'odd', 'even' %> member">
-            	<td class="user"><%= link_to_user member.user %></td>
+            	<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>
                 <% if authorize_for('members', 'edit') %>
                   																		:method => :post,
                   																		:html => { :id => "member-#{member.id}-roles-form", :style => 'display:none;' }) do |f| %>
                   	<p><% roles.each do |role| %>
-                    <label><%= check_box_tag 'member[role_ids][]', role.id, member.roles.include?(role) %> <%=h role %></label><br />
+                    <label><%= check_box_tag 'member[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 'member[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' %>
-                  <%= link_to_remote l(:button_delete), { :url => {:controller => 'members', :action => 'destroy', :id => member},
+                  <%= link_to_remote(l(:button_delete), { :url => {:controller => 'members', :action => 'destroy', :id => member},
                                                           :method => :post
                                                         }, :title => l(:button_delete),
-                                                           :class => 'icon icon-del' %>
+                                                           :class => 'icon icon-del') if member.deletable? %>
               </td>
               <%= call_hook(:view_projects_settings_members_table_row, { :project => @project, :member => member}) %>
             	</tr>
             </div>
-            <% users_count = User.active.count - @project.users.count
+            <% principals = Principal.active.find(:all, :limit => 100, :order => 'type, login, lastname ASC') - @project.principals %>
-               users = (users_count < 300) ? User.active.find(:all, :limit => 200).sort - @project.users : [] %>
             <div class="splitcontentright">
-            <% if roles.any? && users_count > 0 %>
+            <% if roles.any? && principals.any? %>
               <% remote_form_for(:member, @member, :url => {:controller => 'members', :action => 'new', :id => @project}, :method => :post) do |f| %>
                 <fieldset><legend><%=l(:label_member_new)%></legend>
-            		<p><%= text_field_tag 'member[user_login]', nil, :size => "40" %></p>
-            		<div id="member_user_login_choices" class="autocomplete">sqd</div>
+            		<p><%= text_field_tag 'principal_search', nil, :size => "40" %></p>
-            		<%= javascript_tag "new Ajax.Autocompleter('member_user_login', 'member_user_login_choices', '#{ url_for(:controller => 'members', :action => 'autocomplete_for_member_login', :id => @project) }', { minChars: 1, frequency: 0.5, paramName: 'user' });" %>
+            		<%= observe_field(:principal_search,
-            		<% unless users.empty? %>
+                             :frequency => 0.5,
-            			<div>
+                             :update => :principals,
-            			<% users.each do |user| -%>
+                             :url => { :controller => 'members', :action => 'autocomplete_for_member', :id => @project },
-            			<label><%= check_box_tag 'member[user_ids][]', user.id, false %> <%= user %></label>
+                             :with => 'q')
-            			<% end -%>
+                              %>
-            			</div>
-            		<% end %>
+            		<div id="principals">
+            			<%= principals_check_box_tags 'member[user_ids][]', principals %>
+            		</div>
                 <p><%= l(:label_role_plural) %>:
                 <% roles.each do |role| %>
                 	<label><%= check_box_tag 'member[role_ids][]', role.id %> <%=h role %></label>
                	<% end %></p>
                 <p><%= submit_tag l(:button_add) %></p>
             		</fieldset>
               <% end %>

app/views/users/_memberships.rhtml +5 -3

                 <% remote_form_for(:membership, :url => { :action => 'edit_membership', :id => @user, :membership_id => membership },
                   														  :html => { :id => "member-#{membership.id}-roles-form", :style => 'display:none;'}) do %>
                   	<p><% roles.each do |role| %>
-                    <label><%= check_box_tag 'membership[role_ids][]', role.id, membership.roles.include?(role) %> <%=h role %></label><br />
+                    <label><%= check_box_tag 'membership[role_ids][]', role.id, membership.roles.include?(role),
+                    																									 :disabled => membership.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) %>
                     <%= link_to_function l(:button_cancel), "$('member-#{membership.id}-roles').show(); $('member-#{membership.id}-roles-form').hide(); return false;" %></p>
                 <% end %>
               </td>
               <td class="buttons">
                   <%= link_to_function l(:button_edit), "$('member-#{membership.id}-roles').hide(); $('member-#{membership.id}-roles-form').show(); return false;", :class => 'icon icon-edit' %>
-                  <%= link_to_remote l(:button_delete), { :url => { :controller => 'users', :action => 'destroy_membership', :id => @user, :membership_id => membership },
+                  <%= link_to_remote(l(:button_delete), { :url => { :controller => 'users', :action => 'destroy_membership', :id => @user, :membership_id => membership },
                   																				:method => :post },
-                  																		  :class => 'icon icon-del' %>
+                  																		    :class => 'icon icon-del') if membership.deletable? %>
               </td>
                   <%= call_hook(:view_users_memberships_table_row, :user => @user, :membership => membership, :roles => roles, :projects => projects )%>
             	</tr>

config/locales/en.yml +3 0

               label_date_from_to: From {{start}} to {{end}}
               label_wiki_content_added: Wiki page added
               label_wiki_content_updated: Wiki page updated
+              label_group: Group
+              label_group_plural: Groups
+              label_group_new: New group
               button_login: Login
               button_submit: Submit

config/routes.rb +2 -1

               map.connect 'attachments/:id/:filename', :controller => 'attachments', :action => 'show', :id => /\d+/, :filename => /.*/
               map.connect 'attachments/download/:id/:filename', :controller => 'attachments', :action => 'download', :id => /\d+/, :filename => /.*/
+              map.resources :groups
               #left old routes at the bottom for backwards compat
               map.connect 'projects/:project_id/issues/:action', :controller => 'issues'
               map.connect 'projects/:project_id/documents/:action', :controller => 'documents'

lib/redmine.rb +1 -1

               map.permission :add_project, {:projects => :add}, :require => :loggedin
               map.permission :edit_project, {:projects => [:settings, :edit]}, :require => :member
               map.permission :select_project_modules, {:projects => :modules}, :require => :member
-              map.permission :manage_members, {:projects => :settings, :members => [:new, :edit, :destroy, :autocomplete_for_member_login]}, :require => :member
+              map.permission :manage_members, {:projects => :settings, :members => [:new, :edit, :destroy, :autocomplete_for_member]}, :require => :member
               map.permission :manage_versions, {:projects => [:settings, :add_version], :versions => [:edit, :destroy]}, :require => :member
               map.project_module :issue_tracking do |map|

public/images/22x22/users.png binary modified 0 0

NO CONTENT: modified file, binary diff hidden

public/stylesheets/application.css +9 -6

             a.atom { background: url(../images/feed.png) no-repeat 1px 50%; padding: 2px 0px 3px 16px; }
             /* Project members tab */
-            div#tab-content-members .splitcontentleft, div#tab-content-memberships .splitcontentleft { width: 64% }
+            div#tab-content-members .splitcontentleft, div#tab-content-memberships .splitcontentleft, div#tab-content-users .splitcontentleft { width: 64% }
-            div#tab-content-members .splitcontentright, div#tab-content-memberships .splitcontentright { width: 34% }
+            div#tab-content-members .splitcontentright, div#tab-content-memberships .splitcontentright, div#tab-content-users .splitcontentright { width: 34% }
-            div#tab-content-members fieldset, div#tab-content-memberships fieldset { padding:1em; margin-bottom: 1em; }
+            div#tab-content-members fieldset, div#tab-content-memberships fieldset, div#tab-content-users fieldset { padding:1em; margin-bottom: 1em; }
-            div#tab-content-members fieldset legend, div#tab-content-memberships fieldset legend { font-weight: bold; }
+            div#tab-content-members fieldset legend, div#tab-content-memberships fieldset legend, div#tab-content-users fieldset legend { font-weight: bold; }
-            div#tab-content-members fieldset label, div#tab-content-memberships fieldset label { display: block; }
+            div#tab-content-members fieldset label, div#tab-content-memberships fieldset label, div#tab-content-users fieldset label { display: block; }
-            div#tab-content-members fieldset div { max-height: 400px; overflow:auto; }
+            div#tab-content-members fieldset div, div#tab-content-users fieldset div { max-height: 400px; overflow:auto; }
+            table.members td.group { padding-left: 20px; background: url(../images/users.png) no-repeat 0% 0%; }
             * html div#tab-content-members fieldset div { height: 450px; }
             .icon22-projects { background-image: url(../images/22x22/projects.png); }
             .icon22-users { background-image: url(../images/22x22/users.png); }
+            .icon22-groups { background-image: url(../images/22x22/groups.png); }
             .icon22-tracker { background-image: url(../images/22x22/tracker.png); }
             .icon22-role { background-image: url(../images/22x22/role.png); }
             .icon22-workflow { background-image: url(../images/22x22/workflow.png); }

test/fixtures/member_roles.yml +18 -2

@@ -19,5 +19,21 member_roles_005:
19	id: 5	19	id: 5
20	role_id: 1	20	role_id: 1
21	member_id: 5	21	member_id: 5
22		22	member_roles_006:
23	No newline at end of file	23	id: 6
		24	role_id: 1
		25	member_id: 6
		26	member_roles_007:
		27	id: 7
		28	role_id: 2
		29	member_id: 6
		30	member_roles_008:
		31	id: 8
		32	role_id: 1
		33	member_id: 7
		34	inherited_from: 6
		35	member_roles_009:
		36	id: 9
		37	role_id: 2
		38	member_id: 7
		39	inherited_from: 7

test/fixtures/members.yml +12 0

@@ -30,4 +30,16 members_005:
30	project_id: 5	30	project_id: 5
31	user_id: 2	31	user_id: 2
32	mail_notification: true	32	mail_notification: true
		33	members_006:
		34	id: 6
		35	created_on: 2006-07-19 19:35:33 +02:00
		36	project_id: 5
		37	user_id: 10
		38	mail_notification: false
		39	members_007:
		40	id: 7
		41	created_on: 2006-07-19 19:35:33 +02:00
		42	project_id: 5
		43	user_id: 8
		44	mail_notification: false
33	No newline at end of file	45

test/fixtures/users.yml +8 0

@@ -144,5 +144,13 users_009:
144	mail_notification: false	144	mail_notification: false
145	login: miscuser9	145	login: miscuser9
146	type: User	146	type: User
		147	groups_010:
		148	id: 10
		149	lastname: A Team
		150	type: Group
		151	groups_011:
		152	id: 11
		153	lastname: B Team
		154	type: Group
147		155
148	No newline at end of file	156

test/functional/members_controller_test.rb +5 -12

                 assert User.find(7).member_of?(Project.find(1))
               end
-              def test_create_by_user_login
-                assert_difference 'Member.count' do
-                  post :new, :id => 1, :member => {:role_ids => [1], :user_login => 'someone'}
-                end
-                assert_redirected_to '/projects/ecookbook/settings/members'
-                assert User.find(7).member_of?(Project.find(1))
-              end
               def test_create_multiple
                 assert_difference 'Member.count', 3 do
                   post :new, :id => 1, :member => {:role_ids => [1], :user_ids => [7, 8, 9]}
                 assert !User.find(3).member_of?(Project.find(1))
               end
-              def test_autocomplete_for_member_login
+              def test_autocomplete_for_member
-                get :autocomplete_for_member_login, :id => 1, :user => 'mis'
+                get :autocomplete_for_member, :id => 1, :q => 'mis'
                 assert_response :success
-                assert_template 'autocomplete_for_member_login'
+                assert_template 'autocomplete_for_member'
-                assert_tag :ul, :child => {:tag => 'li', :content => /miscuser8/}
+                assert_tag :label, :content => /User Misc/,
+                                   :child => { :tag => 'input', :attributes => { :name => 'member[user_ids][]', :value => '8' } }
               end
             end

test/integration/admin_test.rb +4 -3

             require "#{File.dirname(__FILE__)}/../test_helper"
             class AdminTest < ActionController::IntegrationTest
-              fixtures :users
+              fixtures :all
               def test_add_user
                 log_user("admin", "admin")
                 assert_response :success
                 assert_template "users/add"
                 post "/users/add", :user => { :login => "psmith", :firstname => "Paul", :lastname => "Smith", :mail => "psmith@somenet.foo", :language => "en" }, :password => "psmith09", :password_confirmation => "psmith09"
-                assert_redirected_to "/users"
                 user = User.find_by_login("psmith")
                 assert_kind_of User, user
+                assert_redirected_to "/users/#{ user.id }/edit"
                 logged_user = User.try_to_login("psmith", "psmith09")
                 assert_kind_of User, logged_user
                 assert_equal "Paul", logged_user.firstname
                 post "users/edit", :id => user.id, :user => { :status => User::STATUS_LOCKED }
-                assert_redirected_to "/users"
+                assert_redirected_to "/users/#{ user.id }/edit"
                 locked_user = User.try_to_login("psmith", "psmith09")
                 assert_equal nil, locked_user
               end

test/unit/project_test.rb +12 0

@@ -63,6 +63,18 class ProjectTest < Test::Unit::TestCase
63	end	63	end
64	end	64	end
65		65
		66	def test_members_should_be_active_users
		67	Project.all.each do \|project\|
		68	assert_nil project.members.detect {\|m\| !(m.user.is_a?(User) && m.user.active?) }
		69	end
		70	end
		71
		72	def test_users_should_be_active_users
		73	Project.all.each do \|project\|
		74	assert_nil project.users.detect {\|u\| !(u.is_a?(User) && u.active?) }
		75	end
		76	end
		77
66	def test_archive	78	def test_archive
67	user = @ecookbook.members.first.user	79	user = @ecookbook.members.first.user
68	@ecookbook.archive	80	@ecookbook.archive

app/views/members/autocomplete_for_member_login.rhtml removed 0 -5

NO CONTENT: file was removed

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages