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

              # redMine - project management software
              # Copyright (C) 2006  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
              # as published by the Free Software Foundation; either version 2
              # of the License, or (at your option) any later version.
              #
              # This program is distributed in the hope that it will be useful,
              # but WITHOUT ANY WARRANTY; without even the implied warranty of
              # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
              # GNU General Public License for more details.
              #
              # You should have received a copy of the GNU General Public License
              # along with this program; if not, write to the Free Software
              # 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_project, :only => [:new, :autocomplete_for_member_login]
+               before_filter :find_member, :except => [:new, :autocomplete_for_member]
+               before_filter :find_project, :only => [:new, :autocomplete_for_member]
                before_filter :authorize
                def new
                  members = []
                  if params[:member] && request.post?
                    attrs = params[:member].dup
                    if (user_ids = attrs.delete(:user_ids))
                      user_ids.each do |user_id|
                        members << Member.new(attrs.merge(:user_id => user_id))
                      end
                    else
                      members << Member.new(attrs)
                    end
                    @project.members << members
                  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'
                        members.each {|member| page.visual_effect(:highlight, "member-#{member.id}") }
                      }
                    }
                  end
                end
                def edit
                  if request.post? and @member.update_attributes(params[:member])
                	 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'
                          page.visual_effect(:highlight, "member-#{@member.id}")
                        }
                      }
                    end
                  end
                end
                def destroy
-                 @member.destroy
-             	respond_to do |format|
+                 if request.post? && @member.deletable?
+                   @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
-                 @users = User.active.find(:all, :conditions => ["LOWER(login) LIKE ? OR LOWER(firstname) LIKE ? OR LOWER(lastname) LIKE ?", "#{params[:user]}%", "#{params[:user]}%", "#{params[:user]}%"],
-                                                 :limit => 10,
-                                                 :order => 'login ASC') - @project.users
+               def autocomplete_for_member
+                 @principals = Principal.active.like(params[:q]).find(:all, :limit => 100) - @project.principals
                  render :layout => false
                end
              private
                def find_project
                  @project = Project.find(params[:id])
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
                def find_member
                  @member = Member.find(params[:id])
                  @project = @member.project
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
              end

app/controllers/users_controller.rb +10 -5

              # redMine - project management software
              # Copyright (C) 2006-2007  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
              # as published by the Free Software Foundation; either version 2
              # of the License, or (at your option) any later version.
              #
              # This program is distributed in the hope that it will be useful,
              # but WITHOUT ANY WARRANTY; without even the implied warranty of
              # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
              # GNU General Public License for more details.
              #
              # You should have received a copy of the GNU General Public License
              # along with this program; if not, write to the Free Software
              # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
              class UsersController < ApplicationController
                before_filter :require_admin
                helper :sort
                include SortHelper
                helper :custom_fields
                include CustomFieldsHelper
                def index
                  list
                  render :action => 'list' unless request.xhr?
                end
                def list
                  sort_init 'login', 'asc'
                  sort_update %w(login firstname lastname mail admin created_on last_login_on)
                  @status = params[:status] ? params[:status].to_i : 1
                  c = ARCondition.new(@status == 0 ? "status <> 0" : ["status = ?", @status])
                  unless params[:name].blank?
                    name = "%#{params[:name].strip.downcase}%"
                    c << ["LOWER(login) LIKE ? OR LOWER(firstname) LIKE ? OR LOWER(lastname) LIKE ?", name, name, name]
                  end
                  @user_count = User.count(:conditions => c.conditions)
                  @user_pages = Paginator.new self, @user_count,
              								per_page_option,
              								params['page']
                  @users =  User.find :all,:order => sort_clause,
                                      :conditions => c.conditions,
              						:limit  =>  @user_pages.items_per_page,
              						:offset =>  @user_pages.current.offset
                  render :action => "list", :layout => false if request.xhr?
                end
                def add
                  if request.get?
                    @user = User.new(:language => Setting.default_language)
                  else
                    @user = User.new(params[:user])
                    @user.admin = params[:user][:admin] || false
                    @user.login = params[:user][:login]
                    @user.password, @user.password_confirmation = params[:password], params[:password_confirmation] unless @user.auth_source_id
                    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)
                end
                def edit
                  @user = User.find(params[:id])
                  if request.post?
                    @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])
                    if @user.save
                      if was_activated
                        Mailer.deliver_account_activated(@user)
                      elsif @user.active? && params[:send_information] && !params[:password].blank? && @user.auth_source_id.nil?
                        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(url_for(:action => 'list', :status => params[:status], :page => params[:page]))
+                     redirect_to :back
                    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|
                     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'
                         page.visual_effect(:highlight, "member-#{@membership.id}")
                       }
                     }
                   end
                end
                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'} }
                  end
                end
              end

app/helpers/application_helper.rb +13 -1

              # redMine - project management software
              # Copyright (C) 2006-2007  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
              # as published by the Free Software Foundation; either version 2
              # of the License, or (at your option) any later version.
              #
              # This program is distributed in the hope that it will be useful,
              # but WITHOUT ANY WARRANTY; without even the implied warranty of
              # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
              # GNU General Public License for more details.
              #
              # You should have received a copy of the GNU General Public License
              # along with this program; if not, write to the Free Software
              # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
              require 'coderay'
              require 'coderay/helpers/file_type'
              require 'forwardable'
              require 'cgi'
              module ApplicationHelper
                include Redmine::WikiFormatting::Macros::Definitions
                include Redmine::I18n
                include GravatarHelper::PublicMethods
                extend Forwardable
                def_delegators :wiki_helper, :wikitoolbar_for, :heads_for_wiki_formatter
                # Return true if user is authorized for controller/action, otherwise false
                def authorize_for(controller, action)
                  User.current.allowed_to?({:controller => controller, :action => action}, @project)
                end
                # Display a link if user is authorized
                def link_to_if_authorized(name, options = {}, html_options = nil, *parameters_for_method_reference)
                  link_to(name, options, html_options, *parameters_for_method_reference) if authorize_for(options[:controller] || params[:controller], options[:action])
                end
                # Display a link to remote if user is authorized
                def link_to_remote_if_authorized(name, options = {}, html_options = nil)
                  url = options[:url] || {}
                  link_to_remote(name, options, html_options) if authorize_for(url[:controller] || params[:controller], url[:action])
                end
                # 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={})
                  options[:class] ||= issue.css_classes
                  link_to "#{issue.tracker.name} ##{issue.id}", {:controller => "issues", :action => "show", :id => issue}, options
                end
                # Generates a link to an attachment.
                # Options:
                # * :text - Link text (default to attachment filename)
                # * :download - Force download (default: false)
                def link_to_attachment(attachment, options={})
                  text = options.delete(:text) || attachment.filename
                  action = options.delete(:download) ? 'download' : 'show'
                  link_to(h(text), {:controller => 'attachments', :action => action, :id => attachment, :filename => attachment.filename }, options)
                end
                def toggle_link(name, id, options={})
                  onclick = "Element.toggle('#{id}'); "
                  onclick << (options[:focus] ? "Form.Element.focus('#{options[:focus]}'); " : "this.blur(); ")
                  onclick << "return false;"
                  link_to(name, "#", :onclick => onclick)
                end
                def image_to_function(name, function, html_options = {})
                  html_options.symbolize_keys!
                  tag(:input, html_options.merge({
                      :type => "image", :src => image_path(name),
                      :onclick => (html_options[:onclick] ? "#{html_options[:onclick]}; " : "") + "#{function};"
                      }))
                end
                def prompt_to_remote(name, text, param, url, html_options = {})
                  html_options[:onclick] = "promptToRemote('#{text}', '#{param}', '#{url_for(url)}'); return false;"
                  link_to name, {}, html_options
                end
                def format_activity_title(text)
                  h(truncate_single_line(text, :length => 100))
                end
                def format_activity_day(date)
                  date == Date.today ? l(:label_today).titleize : format_date(date)
                end
                def format_activity_description(text)
                  h(truncate(text.to_s, :length => 120).gsub(%r{[\r\n]*<(pre|code)>.*$}m, '...')).gsub(/[\r\n]+/, "<br />")
                end
                def due_date_distance_in_words(date)
                  if date
                    l((date < Date.today ? :label_roadmap_overdue : :label_roadmap_due_in), distance_of_date_in_words(Date.today, date))
                  end
                end
                def render_page_hierarchy(pages, node=nil)
                  content = ''
                  if pages[node]
                    content << "<ul class=\"pages-hierarchy\">\n"
                    pages[node].each do |page|
                      content << "<li>"
                      content << link_to(h(page.pretty_title), {:controller => 'wiki', :action => 'index', :id => page.project, :page => page.title},
                                         :title => (page.respond_to?(:updated_on) ? l(:label_updated_time, distance_of_time_in_words(Time.now, page.updated_on)) : nil))
                      content << "\n" + render_page_hierarchy(pages, page.id) if pages[page.id]
                      content << "</li>\n"
                    end
                    content << "</ul>\n"
                  end
                  content
                end
                # Renders flash messages
                def render_flash_messages
                  s = ''
                  flash.each do |k,v|
                    s << content_tag('div', v, :class => "flash #{k}")
                  end
                  s
                end
                # Renders the project quick-jump box
                def render_project_jump_box
                  # Retrieve them now to avoid a COUNT query
                  projects = User.current.projects.all
                  if projects.any?
                    s = '<select onchange="if (this.value != \'\') { window.location = this.value; }">' +
                          "<option selected='selected'>#{ l(:label_jump_to_a_project) }</option>" +
                          '<option disabled="disabled">---</option>'
                    s << project_tree_options_for_select(projects) do |p|
                      { :value => url_for(:controller => 'projects', :action => 'show', :id => p, :jump => current_menu_item) }
                    end
                    s << '</select>'
                    s
                  end
                end
                def project_tree_options_for_select(projects, options = {})
                  s = ''
                  project_tree(projects) do |project, level|
                    name_prefix = (level > 0 ? ('&nbsp;' * 2 * level + '&#187; ') : '')
                    tag_options = {:value => project.id, :selected => ((project == options[:selected]) ? 'selected' : nil)}
                    tag_options.merge!(yield(project)) if block_given?
                    s << content_tag('option', name_prefix + h(project), tag_options)
                  end
                  s
                end
                # Yields the given block for each project with its level in the tree
                def project_tree(projects, &block)
                  ancestors = []
                  projects.sort_by(&:lft).each do |project|
                    while (ancestors.any? && !project.is_descendant_of?(ancestors.last))
                      ancestors.pop
                    end
                    yield project, ancestors.size
                    ancestors << project
                  end
                end
                def project_nested_ul(projects, &block)
                  s = ''
                  if projects.any?
                    ancestors = []
                    projects.sort_by(&:lft).each do |project|
                      if (ancestors.empty? || project.is_descendant_of?(ancestors.last))
                        s << "<ul>\n"
                      else
                        ancestors.pop
                        s << "</li>"
                        while (ancestors.any? && !project.is_descendant_of?(ancestors.last))
                          ancestors.pop
                          s << "</ul></li>\n"
                        end
                      end
                      s << "<li>"
                      s << yield(project).to_s
                      ancestors << project
                    end
                    s << ("</li></ul>\n" * ancestors.size)
                  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)
                  truncate(string, *args).gsub(%r{[\r\n]+}m, ' ')
                end
                def html_hours(text)
                  text.gsub(%r{(\d+)\.(\d+)}, '<span class="hours hours-int">\1</span><span class="hours hours-dec">.\2</span>')
                end
                def authoring(created, author, options={})
                  author_tag = (author.is_a?(User) && !author.anonymous?) ? link_to(h(author), :controller => 'account', :action => 'show', :id => author) : h(author || 'Anonymous')
                  l(options[:label] || :label_added_time_by, :author => author_tag, :age => time_tag(created))
                end
                def time_tag(time)
                  text = distance_of_time_in_words(Time.now, time)
                  if @project
                    link_to(text, {:controller => 'projects', :action => 'activity', :id => @project, :from => time.to_date}, :title => format_time(time))
                  else
                    content_tag('acronym', text, :title => format_time(time))
                  end
                end
                def syntax_highlight(name, content)
                  type = CodeRay::FileType[name]
                  type ? CodeRay.scan(content, type).html : h(content)
                end
                def to_path_param(path)
                  path.to_s.split(%r{[/\\]}).select {|p| !p.blank?}
                end
                def pagination_links_full(paginator, count=nil, options={})
                  page_param = options.delete(:page_param) || :page
                  url_param = params.dup
                  # don't reuse query params if filters are present
                  url_param.merge!(:fields => nil, :values => nil, :operators => nil) if url_param.delete(:set_filter)
                  html = ''
                  if paginator.current.previous
                    html << link_to_remote_content_update('&#171; ' + l(:label_previous), url_param.merge(page_param => paginator.current.previous)) + ' '
                  end
                  html << (pagination_links_each(paginator, options) do |n|
                    link_to_remote_content_update(n.to_s, url_param.merge(page_param => n))
                  end || '')
                  if paginator.current.next
                    html << ' ' + link_to_remote_content_update((l(:label_next) + ' &#187;'), url_param.merge(page_param => paginator.current.next))
                  end
                  unless count.nil?
                    html << [
                      " (#{paginator.current.first_item}-#{paginator.current.last_item}/#{count})",
                      per_page_links(paginator.items_per_page)
                    ].compact.join(' | ')
                  end
                  html
                end
                def per_page_links(selected=nil)
                  url_param = params.dup
                  url_param.clear if url_param.has_key?(:set_filter)
                  links = Setting.per_page_options_array.collect do |n|
                    n == selected ? n : link_to_remote(n, {:update => "content",
                                                           :url => params.dup.merge(:per_page => n),
                                                           :method => :get},
                                                          {:href => url_for(url_param.merge(:per_page => n))})
                  end
                  links.size > 1 ? l(:label_display_per_page, links.join(', ')) : nil
                end
                def reorder_links(name, url)
                  link_to(image_tag('2uparrow.png',   :alt => l(:label_sort_highest)), url.merge({"#{name}[move_to]" => 'highest'}), :method => :post, :title => l(:label_sort_highest)) +
                  link_to(image_tag('1uparrow.png',   :alt => l(:label_sort_higher)),  url.merge({"#{name}[move_to]" => 'higher'}),  :method => :post, :title => l(:label_sort_higher)) +
                  link_to(image_tag('1downarrow.png', :alt => l(:label_sort_lower)),   url.merge({"#{name}[move_to]" => 'lower'}),   :method => :post, :title => l(:label_sort_lower)) +
                  link_to(image_tag('2downarrow.png', :alt => l(:label_sort_lowest)),  url.merge({"#{name}[move_to]" => 'lowest'}),  :method => :post, :title => l(:label_sort_lowest))
                end
                def breadcrumb(*args)
                  elements = args.flatten
                  elements.any? ? content_tag('p', args.join(' &#187; ') + ' &#187; ', :class => 'breadcrumb') : nil
                end
                def other_formats_links(&block)
                  concat('<p class="other-formats">' + l(:label_export_to))
                  yield Redmine::Views::OtherFormatsBuilder.new(self)
                  concat('</p>')
                end
                def page_header_title
                  if @project.nil? || @project.new_record?
                    h(Setting.app_title)
                  else
                    b = []
                    ancestors = (@project.root? ? [] : @project.ancestors.visible)
                    if ancestors.any?
                      root = ancestors.shift
                      b << link_to(h(root), {:controller => 'projects', :action => 'show', :id => root, :jump => current_menu_item}, :class => 'root')
                      if ancestors.size > 2
                        b << '&#8230;'
                        ancestors = ancestors[-2, 2]
                      end
                      b += ancestors.collect {|p| link_to(h(p), {:controller => 'projects', :action => 'show', :id => p, :jump => current_menu_item}, :class => 'ancestor') }
                    end
                    b << h(@project)
                    b.join(' &#187; ')
                  end
                end
                def html_title(*args)
                  if args.empty?
                    title = []
                    title << @project.name if @project
                    title += @html_title if @html_title
                    title << Setting.app_title
                    title.compact.join(' - ')
                  else
                    @html_title ||= []
                    @html_title += args
                  end
                end
                def accesskey(s)
                  Redmine::AccessKeys.key_for s
                end
                # Formats text according to system settings.
                # 2 ways to call this method:
                # * with a String: textilizable(text, options)
                # * with an object and one of its attribute: textilizable(issue, :description, options)
                def textilizable(*args)
                  options = args.last.is_a?(Hash) ? args.pop : {}
                  case args.size
                  when 1
                    obj = options[:object]
                    text = args.shift
                  when 2
                    obj = args.shift
                    text = obj.send(args.shift).to_s
                  else
                    raise ArgumentError, 'invalid arguments to textilizable'
                  end
                  return '' if text.blank?
                  only_path = options.delete(:only_path) == false ? false : true
                  # when using an image link, try to use an attachment, if possible
                  attachments = options[:attachments] || (obj && obj.respond_to?(:attachments) ? obj.attachments : nil)
                  if attachments
                    attachments = attachments.sort_by(&:created_on).reverse
                    text = text.gsub(/!((\<|\=|\>)?(\([^\)]+\))?(\[[^\]]+\])?(\{[^\}]+\})?)(\S+\.(bmp|gif|jpg|jpeg|png))!/i) do |m|
                      style = $1
                      filename = $6.downcase
                      # search for the picture in attachments
                      if found = attachments.detect { |att| att.filename.downcase == filename }
                        image_url = url_for :only_path => only_path, :controller => 'attachments', :action => 'download', :id => found
                        desc = found.description.to_s.gsub(/^([^\(\)]*).*$/, "\\1")
                        alt = desc.blank? ? nil : "(#{desc})"
                        "!#{style}#{image_url}#{alt}!"
                      else
                        m
                      end
                    end
                  end
                  text = Redmine::WikiFormatting.to_html(Setting.text_formatting, text) { |macro, args| exec_macro(macro, obj, args) }
                  # different methods for formatting wiki links
                  case options[:wiki_links]
                  when :local
                    # used for local links to html files
                    format_wiki_link = Proc.new {|project, title, anchor| "#{title}.html" }
                  when :anchor
                    # used for single-file wiki export
                    format_wiki_link = Proc.new {|project, title, anchor| "##{title}" }
                  else
                    format_wiki_link = Proc.new {|project, title, anchor| url_for(:only_path => only_path, :controller => 'wiki', :action => 'index', :id => project, :page => title, :anchor => anchor) }
                  end
                  project = options[:project] || @project || (obj && obj.respond_to?(:project) ? obj.project : nil)
                  # Wiki links
                  #
                  # Examples:
                  #   [[mypage]]
                  #   [[mypage|mytext]]
                  # wiki links can refer other project wikis, using project name or identifier:
                  #   [[project:]] -> wiki starting page
                  #   [[project:|mytext]]
                  #   [[project:mypage]]
                  #   [[project:mypage|mytext]]
                  text = text.gsub(/(!)?(\[\[([^\]\n\|]+)(\|([^\]\n\|]+))?\]\])/) do |m|
                    link_project = project
                    esc, all, page, title = $1, $2, $3, $5
                    if esc.nil?
                      if page =~ /^([^\:]+)\:(.*)$/
                        link_project = Project.find_by_name($1) || Project.find_by_identifier($1)
                        page = $2
                        title ||= $1 if page.blank?
                      end
                      if link_project && link_project.wiki
                        # extract anchor
                        anchor = nil
                        if page =~ /^(.+?)\#(.+)$/
                          page, anchor = $1, $2
                        end
                        # check if page exists
                        wiki_page = link_project.wiki.find_page(page)
                        link_to((title || page), format_wiki_link.call(link_project, Wiki.titleize(page), anchor),
                                                 :class => ('wiki-page' + (wiki_page ? '' : ' new')))
                      else
                        # project or wiki doesn't exist
                        all
                      end
                    else
                      all
                    end
                  end
                  # Redmine links
                  #
                  # Examples:
                  #   Issues:
                  #     #52 -> Link to issue #52
                  #   Changesets:
                  #     r52 -> Link to revision 52
                  #     commit:a85130f -> Link to scmid starting with a85130f
                  #   Documents:
                  #     document#17 -> Link to document with id 17
                  #     document:Greetings -> Link to the document with title "Greetings"
                  #     document:"Some document" -> Link to the document with title "Some document"
                  #   Versions:
                  #     version#3 -> Link to version with id 3
                  #     version:1.0.0 -> Link to version named "1.0.0"
                  #     version:"1.0 beta 2" -> Link to version named "1.0 beta 2"
                  #   Attachments:
                  #     attachment:file.zip -> Link to the attachment of the current object named file.zip
                  #   Source files:
                  #     source:some/file -> Link to the file located at /some/file in the project's repository
                  #     source:some/file@52 -> Link to the file's revision 52
                  #     source:some/file#L120 -> Link to line 120 of the file
                  #     source:some/file@52#L120 -> Link to line 120 of the file's revision 52
                  #     export:some/file -> Force the download of the file
                  #  Forum messages:
                  #     message#1218 -> Link to message with id 1218
                  text = text.gsub(%r{([\s\(,\-\>]|^)(!)?(attachment|document|version|commit|source|export|message)?((#|r)(\d+)|(:)([^"\s<>][^\s<>]*?|"[^"]+?"))(?=(?=[[:punct:]]\W)|,|\s|<|$)}) do |m|
                    leading, esc, prefix, sep, oid = $1, $2, $3, $5 || $7, $6 || $8
                    link = nil
                    if esc.nil?
                      if prefix.nil? && sep == 'r'
                        if project && (changeset = project.changesets.find_by_revision(oid))
                          link = link_to("r#{oid}", {:only_path => only_path, :controller => 'repositories', :action => 'revision', :id => project, :rev => oid},
                                                    :class => 'changeset',
                                                    :title => truncate_single_line(changeset.comments, :length => 100))
                        end
                      elsif sep == '#'
                        oid = oid.to_i
                        case prefix
                        when nil
                          if issue = Issue.find_by_id(oid, :include => [:project, :status], :conditions => Project.visible_by(User.current))
                            link = link_to("##{oid}", {:only_path => only_path, :controller => 'issues', :action => 'show', :id => oid},
                                                      :class => (issue.closed? ? 'issue closed' : 'issue'),
                                                      :title => "#{truncate(issue.subject, :length => 100)} (#{issue.status.name})")
                            link = content_tag('del', link) if issue.closed?
                          end
                        when 'document'
                          if document = Document.find_by_id(oid, :include => [:project], :conditions => Project.visible_by(User.current))
                            link = link_to h(document.title), {:only_path => only_path, :controller => 'documents', :action => 'show', :id => document},
                                                              :class => 'document'
                          end
                        when 'version'
                          if version = Version.find_by_id(oid, :include => [:project], :conditions => Project.visible_by(User.current))
                            link = link_to h(version.name), {:only_path => only_path, :controller => 'versions', :action => 'show', :id => version},
                                                            :class => 'version'
                          end
                        when 'message'
                          if message = Message.find_by_id(oid, :include => [:parent, {:board => :project}], :conditions => Project.visible_by(User.current))
                            link = link_to h(truncate(message.subject, :length => 60)), {:only_path => only_path,
                                                                              :controller => 'messages',
                                                                              :action => 'show',
                                                                              :board_id => message.board,
                                                                              :id => message.root,
                                                                              :anchor => (message.parent ? "message-#{message.id}" : nil)},
                                                               :class => 'message'
                          end
                        end
                      elsif sep == ':'
                        # removes the double quotes if any
                        name = oid.gsub(%r{^"(.*)"$}, "\\1")
                        case prefix
                        when 'document'
                          if project && document = project.documents.find_by_title(name)
                            link = link_to h(document.title), {:only_path => only_path, :controller => 'documents', :action => 'show', :id => document},
                                                              :class => 'document'
                          end
                        when 'version'
                          if project && version = project.versions.find_by_name(name)
                            link = link_to h(version.name), {:only_path => only_path, :controller => 'versions', :action => 'show', :id => version},
                                                            :class => 'version'
                          end
                        when 'commit'
                          if project && (changeset = project.changesets.find(:first, :conditions => ["scmid LIKE ?", "#{name}%"]))
                            link = link_to h("#{name}"), {:only_path => only_path, :controller => 'repositories', :action => 'revision', :id => project, :rev => changeset.revision},
                                                         :class => 'changeset',
                                                         :title => truncate_single_line(changeset.comments, :length => 100)
                          end
                        when 'source', 'export'
                          if project && project.repository
                            name =~ %r{^[/\\]*(.*?)(@([0-9a-f]+))?(#(L\d+))?$}
                            path, rev, anchor = $1, $3, $5
                            link = link_to h("#{prefix}:#{name}"), {:controller => 'repositories', :action => 'entry', :id => project,
                                                                    :path => to_path_param(path),
                                                                    :rev => rev,
                                                                    :anchor => anchor,
                                                                    :format => (prefix == 'export' ? 'raw' : nil)},
                                                                   :class => (prefix == 'export' ? 'source download' : 'source')
                          end
                        when 'attachment'
                          if attachments && attachment = attachments.detect {|a| a.filename == name }
                            link = link_to h(attachment.filename), {:only_path => only_path, :controller => 'attachments', :action => 'download', :id => attachment},
                                                                   :class => 'attachment'
                          end
                        end
                      end
                    end
                    leading + (link || "#{prefix}#{sep}#{oid}")
                  end
                  text
                end
                # Same as Rails' simple_format helper without using paragraphs
                def simple_format_without_paragraph(text)
                  text.to_s.
                    gsub(/\r\n?/, "\n").                    # \r\n and \r -> \n
                    gsub(/\n\n+/, "<br /><br />").          # 2+ newline  -> 2 br
                    gsub(/([^\n]\n)(?=[^\n])/, '\1<br />')  # 1 newline   -> br
                end
                def lang_options_for_select(blank=true)
                  (blank ? [["(auto)", ""]] : []) +
                    valid_languages.collect{|lang| [ ll(lang.to_s, :general_lang_name), lang.to_s]}.sort{|x,y| x.last <=> y.last }
                end
                def label_tag_for(name, option_tags = nil, options = {})
                  label_text = l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym) + (options.delete(:required) ? @template.content_tag("span", " *", :class => "required"): "")
                  content_tag("label", label_text)
                end
                def labelled_tabular_form_for(name, object, options, &proc)
                  options[:html] ||= {}
                  options[:html][:class] = 'tabular' unless options[:html].has_key?(:class)
                  form_for(name, object, options.merge({ :builder => TabularFormBuilder, :lang => current_language}), &proc)
                end
                def back_url_hidden_field_tag
                  back_url = params[:back_url] || request.env['HTTP_REFERER']
                  back_url = CGI.unescape(back_url.to_s)
                  hidden_field_tag('back_url', CGI.escape(back_url)) unless back_url.blank?
                end
                def check_all_links(form_name)
                  link_to_function(l(:button_check_all), "checkAll('#{form_name}', true)") +
                  " | " +
                  link_to_function(l(:button_uncheck_all), "checkAll('#{form_name}', false)")
                end
                def progress_bar(pcts, options={})
                  pcts = [pcts, pcts] unless pcts.is_a?(Array)
                  pcts[1] = pcts[1] - pcts[0]
                  pcts << (100 - pcts[1] - pcts[0])
                  width = options[:width] || '100px;'
                  legend = options[:legend] || ''
                  content_tag('table',
                    content_tag('tr',
                      (pcts[0] > 0 ? content_tag('td', '', :style => "width: #{pcts[0].floor}%;", :class => 'closed') : '') +
                      (pcts[1] > 0 ? content_tag('td', '', :style => "width: #{pcts[1].floor}%;", :class => 'done') : '') +
                      (pcts[2] > 0 ? content_tag('td', '', :style => "width: #{pcts[2].floor}%;", :class => 'todo') : '')
                    ), :class => 'progress', :style => "width: #{width};") +
                    content_tag('p', legend, :class => 'pourcent')
                end
                def context_menu_link(name, url, options={})
                  options[:class] ||= ''
                  if options.delete(:selected)
                    options[:class] << ' icon-checked disabled'
                    options[:disabled] = true
                  end
                  if options.delete(:disabled)
                    options.delete(:method)
                    options.delete(:confirm)
                    options.delete(:onclick)
                    options[:class] << ' disabled'
                    url = '#'
                  end
                  link_to name, url, options
                end
                def calendar_for(field_id)
                  include_calendar_headers_tags
                  image_tag("calendar.png", {:id => "#{field_id}_trigger",:class => "calendar-trigger"}) +
                  javascript_tag("Calendar.setup({inputField : '#{field_id}', ifFormat : '%Y-%m-%d', button : '#{field_id}_trigger' });")
                end
                def include_calendar_headers_tags
                  unless @calendar_headers_tags_included
                    @calendar_headers_tags_included = true
                    content_for :header_tags do
                      javascript_include_tag('calendar/calendar') +
                      javascript_include_tag("calendar/lang/calendar-#{current_language.to_s.downcase}.js") +
                      javascript_include_tag('calendar/calendar-setup') +
                      stylesheet_link_tag('calendar')
                    end
                  end
                end
                def content_for(name, content = nil, &block)
                  @has_content ||= {}
                  @has_content[name] = true
                  super(name, content, &block)
                end
                def has_content?(name)
                  (@has_content && @has_content[name]) || false
                end
                # Returns the avatar image tag for the given +user+ if avatars are enabled
                # +user+ can be a User or a string that will be scanned for an email address (eg. 'joe <joe@foo.bar>')
                def avatar(user, options = { })
                  if Setting.gravatar_enabled?
                    options.merge!({:ssl => Setting.protocol == 'https'})
                    email = nil
                    if user.respond_to?(:mail)
                      email = user.mail
                    elsif user.to_s =~ %r{<(.+?)>}
                      email = $1
                    end
                    return gravatar(email.to_s.downcase, options) unless email.blank? rescue nil
                  end
                end
                private
                def wiki_helper
                  helper = Redmine::WikiFormatting.helper_for(Setting.text_formatting)
                  extend helper
                  return self
                end
                def link_to_remote_content_update(text, url_params)
                  link_to_remote(text,
                    {:url => url_params, :method => :get, :update => 'content', :complete => 'window.scrollTo(0,0)'},
                    {:href => url_for(:params => url_params)}
                  )
                end
              end

app/helpers/custom_fields_helper.rb +2 -1

              # redMine - project management software
              # Copyright (C) 2006  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
              # as published by the Free Software Foundation; either version 2
              # of the License, or (at your option) any later version.
              #
              # This program is distributed in the hope that it will be useful,
              # but WITHOUT ANY WARRANTY; without even the implied warranty of
              # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
              # GNU General Public License for more details.
              #
              # You should have received a copy of the GNU General Public License
              # along with this program; if not, write to the Free Software
              # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
              module CustomFieldsHelper
                def custom_fields_tabs
                  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
                # Return custom field html tag corresponding to its format
                def custom_field_tag(name, custom_value)
                  custom_field = custom_value.custom_field
                  field_name = "#{name}[custom_field_values][#{custom_field.id}]"
                  field_id = "#{name}_custom_field_values_#{custom_field.id}"
                  case custom_field.field_format
                  when "date"
                    text_field_tag(field_name, custom_value.value, :id => field_id, :size => 10) +
                    calendar_for(field_id)
                  when "text"
                    text_area_tag(field_name, custom_value.value, :id => field_id, :rows => 3, :style => 'width:90%')
                  when "bool"
                    check_box_tag(field_name, '1', custom_value.true?, :id => field_id) + hidden_field_tag(field_name, '0')
                  when "list"
                    blank_option = custom_field.is_required? ?
                                     (custom_field.default_value.blank? ? "<option value=\"\">--- #{l(:actionview_instancetag_blank_option)} ---</option>" : '') :
                                     '<option></option>'
                    select_tag(field_name, blank_option + options_for_select(custom_field.possible_values, custom_value.value), :id => field_id)
                  else
                    text_field_tag(field_name, custom_value.value, :id => field_id)
                  end
                end
                # Return custom field label tag
                def custom_field_label_tag(name, custom_value)
                  content_tag "label", custom_value.custom_field.name +
              	(custom_value.custom_field.is_required? ? " <span class=\"required\">*</span>" : ""),
              	:for => "#{name}_custom_field_values_#{custom_value.custom_field.id}",
              	:class => (custom_value.errors.empty? ? nil : "error" )
                end
                # Return custom field tag with its label tag
                def custom_field_tag_with_label(name, custom_value)
                  custom_field_label_tag(name, custom_value) + custom_field_tag(name, custom_value)
                end
                # Return a string used to display a custom value
                def show_value(custom_value)
                  return "" unless custom_value
                  format_value(custom_value.value, custom_value.custom_field.field_format)
                end
                # Return a string used to display a custom value
                def format_value(value, field_format)
                  return "" unless value && !value.empty?
                  case field_format
                  when "date"
                    begin; format_date(value.to_date); rescue; value end
                  when "bool"
                    l(value == "1" ? :general_text_Yes : :general_text_No)
                  else
                    value
                  end
                end
                # Return an array of custom field formats which can be used in select_tag
                def custom_field_formats_for_select
                  CustomField::FIELD_FORMATS.sort {|a,b| a[1][:order]<=>b[1][:order]}.collect { |k| [ l(k[1][:name]), k[0] ] }
                end
              end

app/helpers/users_helper.rb +1 0

              # redMine - project management software
              # Copyright (C) 2006  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
              # as published by the Free Software Foundation; either version 2
              # of the License, or (at your option) any later version.
              #
              # This program is distributed in the hope that it will be useful,
              # but WITHOUT ANY WARRANTY; without even the implied warranty of
              # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
              # GNU General Public License for more details.
              #
              # You should have received a copy of the GNU General Public License
              # along with this program; if not, write to the Free Software
              # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
              module UsersHelper
                def users_status_options_for_select(selected)
                  user_count_by_status = User.count(:group => 'status').to_hash
                  options_for_select([[l(:label_all), ''],
                                      ["#{l(:status_active)} (#{user_count_by_status[1].to_i})", 1],
                                      ["#{l(:status_registered)} (#{user_count_by_status[2].to_i})", 2],
                                      ["#{l(:status_locked)} (#{user_count_by_status[3].to_i})", 3]], selected)
                end
                # Options for the new membership projects combo-box
                def options_for_membership_project_select(user, projects)
                  options = content_tag('option', "--- #{l(:actionview_instancetag_blank_option)} ---")
                  options << project_tree_options_for_select(projects) do |p|
                    {:disabled => (user.projects.include?(p))}
                  end
                  options
                end
                def change_status_link(user)
                  url = {:controller => 'users', :action => 'edit', :id => user, :page => params[:page], :status => params[:status], :tab => nil}
                  if user.locked?
                    link_to l(:button_unlock), url.merge(:user => {:status => User::STATUS_ACTIVE}), :method => :post, :class => 'icon icon-unlock'
                  elsif user.registered?
                    link_to l(:button_activate), url.merge(:user => {:status => User::STATUS_ACTIVE}), :method => :post, :class => 'icon icon-unlock'
                  elsif user != User.current
                    link_to l(:button_lock), url.merge(:user => {:status => User::STATUS_LOCKED}), :method => :post, :class => 'icon icon-lock'
                  end
                end
                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
              end

app/models/member.rb +24 -14

              # Redmine - project management software
              # 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
              # as published by the Free Software Foundation; either version 2
              # of the License, or (at your option) any later version.
              #
              # This program is distributed in the hope that it will be useful,
              # but WITHOUT ANY WARRANTY; without even the implied warranty of
              # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
              # GNU General Public License for more details.
              #
              # You should have received a copy of the GNU General Public License
              # along with this program; if not, write to the Free Software
              # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
              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
-               def user_login=(login)
-                 login = login.to_s
-                 unless login.blank?
-                   if (u = User.find_by_login(login))
-                     self.user = u
-                   end
-                 end
+               alias :base_role_ids= :role_ids=
+               def role_ids=(arg)
+                 ids = (arg || []).collect(&:to_i) - [0]
+                 # Keep inherited roles
+                 ids += member_roles.select {|mr| !mr.inherited_from.nil?}.collect(&:role_id)
+                 new_role_ids = ids - role_ids
+                 # 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
-                 IssueCategory.update_all "assigned_to_id = NULL", ["project_id = ? AND assigned_to_id = ?", project.id, user.id]
+                 if user
+                   # 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

              # Redmine - project management software
              # 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
              # as published by the Free Software Foundation; either version 2
              # of the License, or (at your option) any later version.
              #
              # This program is distributed in the hope that it will be useful,
              # but WITHOUT ANY WARRANTY; without even the implied warranty of
              # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
              # GNU General Public License for more details.
              #
              # You should have received a copy of the GNU General Public License
              # along with this program; if not, write to the Free Software
              # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
              class MemberRole < ActiveRecord::Base
                belongs_to :member
                belongs_to :role
+               after_destroy :remove_member_if_empty
+               after_create :add_role_to_group_users
+               after_destroy :remove_role_from_group_users
                validates_presence_of :role
                def validate
                  errors.add :role_id, :invalid if role && !role.member?
                end
+               private
+               def remove_member_if_empty
+                 if member.roles.empty?
+                   member.destroy
+                 end
+               end
+               def add_role_to_group_users
+                 if member.principal.is_a?(Group)
+                   member.principal.users.each do |user|
+                     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)
+                     user_member.member_roles << MemberRole.new(:role => role, :inherited_from => id)
+                     user_member.save!
+                   end
+                 end
+               end
+               def remove_role_from_group_users
+                 MemberRole.find(:all, :conditions => { :inherited_from => id }).each(&:destroy)
+               end
              end

app/models/project.rb +6 -1

              # redMine - project management software
              # Copyright (C) 2006  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
              # as published by the Free Software Foundation; either version 2
              # of the License, or (at your option) any later version.
              #
              # This program is distributed in the hope that it will be useful,
              # but WITHOUT ANY WARRANTY; without even the implied warranty of
              # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
              # GNU General Public License for more details.
              #
              # You should have received a copy of the GNU General Public License
              # along with this program; if not, write to the Free Software
              # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
              class Project < ActiveRecord::Base
                # Project statuses
                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]
                has_many :issue_changes, :through => :issues, :source => :journals
                has_many :versions, :dependent => :destroy, :order => "#{Version.table_name}.effective_date DESC, #{Version.table_name}.name DESC"
                has_many :time_entries, :dependent => :delete_all
                has_many :queries, :dependent => :delete_all
                has_many :documents, :dependent => :destroy
                has_many :news, :dependent => :delete_all, :include => :author
                has_many :issue_categories, :dependent => :delete_all, :order => "#{IssueCategory.table_name}.name"
                has_many :boards, :dependent => :destroy, :order => "position ASC"
                has_one :repository, :dependent => :destroy
                has_many :changesets, :through => :repository
                has_one :wiki, :dependent => :destroy
                # Custom field for the project issues
                has_and_belongs_to_many :issue_custom_fields,
                                        :class_name => 'IssueCustomField',
                                        :order => "#{CustomField.table_name}.position",
                                        :join_table => "#{table_name_prefix}custom_fields_projects#{table_name_suffix}",
                                        :association_foreign_key => 'custom_field_id'
                acts_as_nested_set :order => 'name', :dependent => :destroy
                acts_as_attachable :view_permission => :view_files,
                                   :delete_permission => :manage_files
                acts_as_customizable
                acts_as_searchable :columns => ['name', 'description'], :project_key => 'id', :permission => nil
                acts_as_event :title => Proc.new {|o| "#{l(:label_project)}: #{o.name}"},
                              :url => Proc.new {|o| {:controller => 'projects', :action => 'show', :id => o.id}},
                              :author => nil
                attr_protected :status, :enabled_module_names
                validates_presence_of :name, :identifier
                validates_uniqueness_of :name, :identifier
                validates_associated :repository, :wiki
                validates_length_of :name, :maximum => 30
                validates_length_of :homepage, :maximum => 255
                validates_length_of :identifier, :in => 1..20
                # donwcase letters, digits, dashes but not digits only
                validates_format_of :identifier, :with => /^(?!\d+$)[a-z0-9\-]*$/, :if => Proc.new { |p| p.identifier_changed? }
                # reserved words
                validates_exclusion_of :identifier, :in => %w( new )
                before_destroy :delete_all_members
                named_scope :has_module, lambda { |mod| { :conditions => ["#{Project.table_name}.id IN (SELECT em.project_id FROM #{EnabledModule.table_name} em WHERE em.name=?)", mod.to_s] } }
                named_scope :active, { :conditions => "#{Project.table_name}.status = #{STATUS_ACTIVE}"}
                named_scope :public, { :conditions => { :is_public => true } }
                named_scope :visible, lambda { { :conditions => Project.visible_by(User.current) } }
                def identifier=(identifier)
                  super unless identifier_frozen?
                end
                def identifier_frozen?
                  errors[:identifier].nil? && !(new_record? || identifier.blank?)
                end
                def issues_with_subprojects(include_subprojects=false)
                  conditions = nil
                  if include_subprojects
                    ids = [id] + descendants.collect(&:id)
                    conditions = ["#{Project.table_name}.id IN (#{ids.join(',')}) AND #{Project.visible_by}"]
                  end
                  conditions ||= ["#{Project.table_name}.id = ?", id]
                  # Quick and dirty fix for Rails 2 compatibility
                  Issue.send(:with_scope, :find => { :conditions => conditions }) do
                    Version.send(:with_scope, :find => { :conditions => conditions }) do
                      yield
                    end
                  end
                end
                # returns latest created projects
                # non public projects will be returned only if user is a member of those
                def self.latest(user=nil, count=5)
                  find(:all, :limit => count, :conditions => visible_by(user), :order => "created_on DESC")
                end
                # Returns a SQL :conditions string used to find all active projects for the specified user.
                #
                # Examples:
                #     Projects.visible_by(admin)        => "projects.status = 1"
                #     Projects.visible_by(normal_user)  => "projects.status = 1 AND projects.is_public = 1"
                def self.visible_by(user=nil)
                  user ||= User.current
                  if user && user.admin?
                    return "#{Project.table_name}.status=#{Project::STATUS_ACTIVE}"
                  elsif user && user.memberships.any?
                    return "#{Project.table_name}.status=#{Project::STATUS_ACTIVE} AND (#{Project.table_name}.is_public = #{connection.quoted_true} or #{Project.table_name}.id IN (#{user.memberships.collect{|m| m.project_id}.join(',')}))"
                  else
                    return "#{Project.table_name}.status=#{Project::STATUS_ACTIVE} AND #{Project.table_name}.is_public = #{connection.quoted_true}"
                  end
                end
                def self.allowed_to_condition(user, permission, options={})
                  statements = []
                  base_statement = "#{Project.table_name}.status=#{Project::STATUS_ACTIVE}"
                  if perm = Redmine::AccessControl.permission(permission)
                    unless perm.project_module.nil?
                      # If the permission belongs to a project module, make sure the module is enabled
                      base_statement << " AND EXISTS (SELECT em.id FROM #{EnabledModule.table_name} em WHERE em.name='#{perm.project_module}' AND em.project_id=#{Project.table_name}.id)"
                    end
                  end
                  if options[:project]
                    project_statement = "#{Project.table_name}.id = #{options[:project].id}"
                    project_statement << " OR (#{Project.table_name}.lft > #{options[:project].lft} AND #{Project.table_name}.rgt < #{options[:project].rgt})" if options[:with_subprojects]
                    base_statement = "(#{project_statement}) AND (#{base_statement})"
                  end
                  if user.admin?
                    # no restriction
                  else
                    statements << "1=0"
                    if user.logged?
                      statements << "#{Project.table_name}.is_public = #{connection.quoted_true}" if Role.non_member.allowed_to?(permission)
                      allowed_project_ids = user.memberships.select {|m| m.roles.detect {|role| role.allowed_to?(permission)}}.collect {|m| m.project_id}
                      statements << "#{Project.table_name}.id IN (#{allowed_project_ids.join(',')})" if allowed_project_ids.any?
                    elsif Role.anonymous.allowed_to?(permission)
                      # anonymous user allowed on public project
                      statements << "#{Project.table_name}.is_public = #{connection.quoted_true}"
                    else
                      # anonymous user is not authorized
                    end
                  end
                  statements.empty? ? base_statement : "((#{base_statement}) AND (#{statements.join(' OR ')}))"
                end
                # Returns a :conditions SQL string that can be used to find the issues associated with this project.
                #
                # Examples:
                #   project.project_condition(true)  => "(projects.id = 1 OR (projects.lft > 1 AND projects.rgt < 10))"
                #   project.project_condition(false) => "projects.id = 1"
                def project_condition(with_subprojects)
                  cond = "#{Project.table_name}.id = #{id}"
                  cond = "(#{cond} OR (#{Project.table_name}.lft > #{lft} AND #{Project.table_name}.rgt < #{rgt}))" if with_subprojects
                  cond
                end
                def self.find(*args)
                  if args.first && args.first.is_a?(String) && !args.first.match(/^\d*$/)
                    project = find_by_identifier(*args)
                    raise ActiveRecord::RecordNotFound, "Couldn't find Project with identifier=#{args.first}" if project.nil?
                    project
                  else
                    super
                  end
                end
                def to_param
                  # id is used for projects with a numeric identifier (compatibility)
                  @to_param ||= (identifier.to_s =~ %r{^\d*$} ? id : identifier)
                end
                def active?
                  self.status == STATUS_ACTIVE
                end
                # Archives the project and its descendants recursively
                def archive
                  # Archive subprojects if any
                  children.each do |subproject|
                    subproject.archive
                  end
                  update_attribute :status, STATUS_ARCHIVED
                end
                # Unarchives the project
                # All its ancestors must be active
                def unarchive
                  return false if ancestors.detect {|a| !a.active?}
                  update_attribute :status, STATUS_ACTIVE
                end
                # Returns an array of projects the project can be moved to
                def possible_parents
                  @possible_parents ||= (Project.active.find(:all) - self_and_descendants)
                end
                # Sets the parent of the project
                # Argument can be either a Project, a String, a Fixnum or nil
                def set_parent!(p)
                  unless p.nil? || p.is_a?(Project)
                    if p.to_s.blank?
                      p = nil
                    else
                      p = Project.find_by_id(p)
                      return false unless p
                    end
                  end
                  if p == parent && !p.nil?
                    # Nothing to do
                    true
                  elsif p.nil? || (p.active? && move_possible?(p))
                    # Insert the project so that target's children or root projects stay alphabetically sorted
                    sibs = (p.nil? ? self.class.roots : p.children)
                    to_be_inserted_before = sibs.detect {|c| c.name.to_s.downcase > name.to_s.downcase }
                    if to_be_inserted_before
                      move_to_left_of(to_be_inserted_before)
                    elsif p.nil?
                      if sibs.empty?
                        # move_to_root adds the project in first (ie. left) position
                        move_to_root
                      else
                        move_to_right_of(sibs.last) unless self == sibs.last
                      end
                    else
                      # move_to_child_of adds the project in last (ie.right) position
                      move_to_child_of(p)
                    end
                    true
                  else
                    # Can not move to the given target
                    false
                  end
                end
                # Returns an array of the trackers used by the project and its active sub projects
                def rolled_up_trackers
                  @rolled_up_trackers ||=
                    Tracker.find(:all, :include => :projects,
                                       :select => "DISTINCT #{Tracker.table_name}.*",
                                       :conditions => ["#{Project.table_name}.lft >= ? AND #{Project.table_name}.rgt <= ? AND #{Project.table_name}.status = #{STATUS_ACTIVE}", lft, rgt],
                                       :order => "#{Tracker.table_name}.position")
                end
                # Returns a hash of project users grouped by role
                def users_by_role
                  members.find(:all, :include => [:user, :roles]).inject({}) do |h, m|
                    m.roles.each do |r|
                      h[r] ||= []
                      h[r] << m.user
                    end
                    h
                  end
                end
                # Deletes all project's members
                def delete_all_members
                  me, mr = Member.table_name, MemberRole.table_name
                  connection.delete("DELETE FROM #{mr} WHERE #{mr}.member_id IN (SELECT #{me}.id FROM #{me} WHERE #{me}.project_id = #{id})")
                  Member.delete_all(['project_id = ?', id])
                end
                # Users issues can be assigned to
                def assignable_users
                  members.select {|m| m.roles.detect {|role| role.assignable?}}.collect {|m| m.user}.sort
                end
                # Returns the mail adresses of users that should be always notified on project events
                def recipients
                  members.select {|m| m.mail_notification? || m.user.mail_notification?}.collect {|m| m.user.mail}
                end
                # Returns an array of all custom fields enabled for project issues
                # (explictly associated custom fields and custom fields enabled for all projects)
                def all_issue_custom_fields
                  @all_issue_custom_fields ||= (IssueCustomField.for_all + issue_custom_fields).uniq.sort
                end
                def project
                  self
                end
                def <=>(project)
                  name.downcase <=> project.name.downcase
                end
                def to_s
                  name
                end
                # Returns a short description of the projects (first lines)
                def short_description(length = 255)
                  description.gsub(/^(.{#{length}}[^\n\r]*).*$/m, '\1...').strip if description
                end
                # Return true if this project is allowed to do the specified action.
                # action can be:
                # * a parameter-like Hash (eg. :controller => 'projects', :action => 'edit')
                # * a permission Symbol (eg. :edit_project)
                def allows_to?(action)
                  if action.is_a? Hash
                    allowed_actions.include? "#{action[:controller]}/#{action[:action]}"
                  else
                    allowed_permissions.include? action
                  end
                end
                def module_enabled?(module_name)
                  module_name = module_name.to_s
                  enabled_modules.detect {|m| m.name == module_name}
                end
                def enabled_module_names=(module_names)
                  if module_names && module_names.is_a?(Array)
                    module_names = module_names.collect(&:to_s)
                    # remove disabled modules
                    enabled_modules.each {|mod| mod.destroy unless module_names.include?(mod.name)}
                    # add new modules
                    module_names.each {|name| enabled_modules << EnabledModule.new(:name => name)}
                  else
                    enabled_modules.clear
                  end
                end
                # Returns an auto-generated project identifier based on the last identifier used
                def self.next_identifier
                  p = Project.find(:first, :order => 'created_on DESC')
                  p.nil? ? nil : p.identifier.to_s.succ
                end
                # Copies and saves the Project instance based on the +project+.
                # Will duplicate the source project's:
                # * Issues
                # * Members
                # * Queries
                def copy(project)
                  project = project.is_a?(Project) ? project : Project.find(project)
                  Project.transaction do
                    # Issues
                    project.issues.each do |issue|
                      new_issue = Issue.new
                      new_issue.copy_from(issue)
                      self.issues << new_issue
                    end
                    # Members
                    project.members.each do |member|
                      new_member = Member.new
                      new_member.attributes = member.attributes.dup.except("project_id")
                      new_member.role_ids = member.role_ids.dup
                      new_member.project = self
                      self.members << new_member
                    end
                    # Queries
                    project.queries.each do |query|
                      new_query = Query.new
                      new_query.attributes = query.attributes.dup.except("project_id", "sort_criteria")
                      new_query.sort_criteria = query.sort_criteria if query.sort_criteria
                      new_query.project = self
                      self.queries << new_query
                    end
                    Redmine::Hook.call_hook(:model_project_copy_before_save, :source_project => project, :destination_project => self)
                    self.save
                  end
                end
                # Copies +project+ and returns the new instance.  This will not save
                # the copy
                def self.copy_from(project)
                  begin
                    project = project.is_a?(Project) ? project : Project.find(project)
                    if project
                      # clear unique attributes
                      attributes = project.attributes.dup.except('name', 'identifier', 'id', 'status')
                      copy = Project.new(attributes)
                      copy.enabled_modules = project.enabled_modules
                      copy.trackers = project.trackers
                      copy.custom_values = project.custom_values.collect {|v| v.clone}
                      return copy
                    else
                      return nil
                    end
                  rescue ActiveRecord::RecordNotFound
                    return nil
                  end
                end
              private
                def allowed_permissions
                  @allowed_permissions ||= begin
                    module_names = enabled_modules.collect {|m| m.name}
                    Redmine::AccessControl.modules_permissions(module_names).collect {|p| p.name}
                  end
                end
                def allowed_actions
                  @actions_allowed ||= allowed_permissions.inject([]) { |actions, permission| actions += Redmine::AccessControl.allowed_actions(permission) }.flatten
                end
              end

app/models/user.rb +7 -8

-             # redMine - project management software
-             # Copyright (C) 2006-2007  Jean-Philippe Lang
+             # Redmine - project management software
+             # 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
              # as published by the Free Software Foundation; either version 2
              # of the License, or (at your option) any later version.
              #
              # This program is distributed in the hope that it will be useful,
              # but WITHOUT ANY WARRANTY; without even the implied warranty of
              # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
              # GNU General Public License for more details.
              #
              # You should have received a copy of the GNU General Public License
              # along with this program; if not, write to the Free Software
              # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
              require "digest/sha1"
-             class User < ActiveRecord::Base
+             class User < Principal
                # Account statuses
                STATUS_ANONYMOUS  = 0
                STATUS_ACTIVE     = 1
                STATUS_REGISTERED = 2
                STATUS_LOCKED     = 3
                USER_FORMATS = {
                  :firstname_lastname => '#{firstname} #{lastname}',
                  :firstname => '#{firstname}',
                  :lastname_firstname => '#{lastname} #{firstname}',
                  :lastname_coma_firstname => '#{lastname}, #{firstname}',
                  :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_many :members, :dependent => :delete_all
-               has_many :projects, :through => :memberships
+               has_and_belongs_to_many :groups, :after_add => Proc.new {|user, group| group.user_added(user)},
+                                                :after_remove => Proc.new {|user, group| group.user_removed(user)}
                has_many :issue_categories, :foreign_key => 'assigned_to_id', :dependent => :nullify
                has_many :changesets, :dependent => :nullify
                has_one :preference, :dependent => :destroy, :class_name => 'UserPreference'
                has_one :rss_token, :dependent => :destroy, :class_name => 'Token', :conditions => "action='feeds'"
                belongs_to :auth_source
                # Active non-anonymous users scope
                named_scope :active, :conditions => "#{User.table_name}.status = #{STATUS_ACTIVE}"
                acts_as_customizable
                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? }
                validates_uniqueness_of :mail, :if => Proc.new { |user| !user.mail.blank? }, :case_sensitive => false
                # Login must contain lettres, numbers, underscores only
                validates_format_of :login, :with => /^[a-z0-9_\-@\.]*$/i
                validates_length_of :login, :maximum => 30
                validates_format_of :firstname, :lastname, :with => /^[\w\s\'\-\.]*$/i
                validates_length_of :firstname, :lastname, :maximum => 30
                validates_format_of :mail, :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i, :allow_nil => true
                validates_length_of :mail, :maximum => 60, :allow_nil => true
                validates_confirmation_of :password, :allow_nil => true
                def before_create
                  self.mail_notification = false
                  true
                end
                def before_save
                  # update hashed_password if password was set
                  self.hashed_password = User.hash_password(self.password) if self.password
                end
                def reload(*args)
                  @name = nil
                  super
                end
                def identity_url=(url)
                  if url.blank?
                    write_attribute(:identity_url, '')
                  else
                    begin
                      write_attribute(:identity_url, OpenIdAuthentication.normalize_identifier(url))
                    rescue OpenIdAuthentication::InvalidOpenId
                      # Invlaid url, don't save
                    end
                  end
                  self.read_attribute(:identity_url)
                end
                # Returns the user that matches provided login and password, or nil
                def self.try_to_login(login, password)
                  # Make sure no one can sign in with an empty password
                  return nil if password.to_s.empty?
                  user = find(:first, :conditions => ["login=?", login])
                  if user
                    # user is already in local database
                    return nil if !user.active?
                    if user.auth_source
                      # user has an external authentication method
                      return nil unless user.auth_source.authenticate(login, password)
                    else
                      # authentication with local password
                      return nil unless User.hash_password(password) == user.hashed_password
                    end
                  else
                    # user is not yet registered, try to authenticate with available sources
                    attrs = AuthSource.authenticate(login, password)
                    if attrs
                      user = new(*attrs)
                      user.login = login
                      user.language = Setting.default_language
                      if user.save
                        user.reload
                        logger.info("User '#{user.login}' created from the LDAP") if logger
                      end
                    end
                  end
                  user.update_attribute(:last_login_on, Time.now) if user && !user.new_record?
                  user
                rescue => text
                  raise text
                end
                # Returns the user who matches the given autologin +key+ or nil
                def self.try_to_autologin(key)
                  tokens = Token.find_all_by_action_and_value('autologin', key)
                  # Make sure there's only 1 token that matches the key
                  if tokens.size == 1
                    token = tokens.first
                    if (token.created_on > Setting.autologin.to_i.day.ago) && token.user && token.user.active?
                      token.user.update_attribute(:last_login_on, Time.now)
                      token.user
                    end
                  end
                end
                # Return user's full name for display
                def name(formatter = nil)
                  if formatter
                    eval('"' + (USER_FORMATS[formatter] || USER_FORMATS[:firstname_lastname]) + '"')
                  else
                    @name ||= eval('"' + (USER_FORMATS[Setting.user_format] || USER_FORMATS[:firstname_lastname]) + '"')
                  end
                end
                def active?
                  self.status == STATUS_ACTIVE
                end
                def registered?
                  self.status == STATUS_REGISTERED
                end
                def locked?
                  self.status == STATUS_LOCKED
                end
                def check_password?(clear_password)
                  User.hash_password(clear_password) == self.hashed_password
                end
                # Generate and set a random password.  Useful for automated user creation
                # Based on Token#generate_token_value
                #
                def random_password
                  chars = ("a".."z").to_a + ("A".."Z").to_a + ("0".."9").to_a
                  password = ''
 .times { |i| password << chars[rand(chars.size-1)] }
                  self.password = password
                  self.password_confirmation = password
                  self
                end
                def pref
                  self.preference ||= UserPreference.new(:user => self)
                end
                def time_zone
                  @time_zone ||= (self.pref.time_zone.blank? ? nil : ActiveSupport::TimeZone[self.pref.time_zone])
                end
                def wants_comments_in_reverse_order?
                  self.pref[:comments_sorting] == 'desc'
                end
                # Return user's RSS key (a 40 chars long string), used to access feeds
                def rss_key
                  token = self.rss_token || Token.create(:user => self, :action => 'feeds')
                  token.value
                end
                # Return an array of project ids for which the user has explicitly turned mail notifications on
                def notified_projects_ids
                  @notified_projects_ids ||= memberships.select {|m| m.mail_notification?}.collect(&:project_id)
                end
                def notified_project_ids=(ids)
                  Member.update_all("mail_notification = #{connection.quoted_false}", ['user_id = ?', id])
                  Member.update_all("mail_notification = #{connection.quoted_true}", ['user_id = ? AND project_id IN (?)', id, ids]) if ids && !ids.empty?
                  @notified_projects_ids = nil
                  notified_projects_ids
                end
                def self.find_by_rss_key(key)
                  token = Token.find_by_value(key)
                  token && token.user.active? ? token.user : nil
                end
                # Makes find_by_mail case-insensitive
                def self.find_by_mail(mail)
                  find(:first, :conditions => ["LOWER(mail) = ?", mail.to_s.downcase])
                end
                # Sort users by their display names
                def <=>(user)
                  self.to_s.downcase <=> user.to_s.downcase
                end
                def to_s
                  name
                end
                def logged?
                  true
                end
                def anonymous?
                  !logged?
                end
                # Return user's roles for project
                def roles_for_project(project)
                  roles = []
                  # No role on archived projects
                  return roles unless project && project.active?
                  if logged?
                    # Find project membership
                    membership = memberships.detect {|m| m.project_id == project.id}
                    if membership
                      roles = membership.roles
                    else
                      @role_non_member ||= Role.non_member
                      roles << @role_non_member
                    end
                  else
                    @role_anonymous ||= Role.anonymous
                    roles << @role_anonymous
                  end
                  roles
                end
                # Return true if the user is a member of project
                def member_of?(project)
                  !roles_for_project(project).detect {|role| role.member?}.nil?
                end
                # Return true if the user is allowed to do the specified action on project
                # action can be:
                # * a parameter-like Hash (eg. :controller => 'projects', :action => 'edit')
                # * a permission Symbol (eg. :edit_project)
                def allowed_to?(action, project, options={})
                  if project
                    # No action allowed on archived projects
                    return false unless project.active?
                    # No action allowed on disabled modules
                    return false unless project.allows_to?(action)
                    # Admin users are authorized for anything else
                    return true if admin?
                    roles = roles_for_project(project)
                    return false unless roles
                    roles.detect {|role| (project.is_public? || role.member?) && role.allowed_to?(action)}
                  elsif options[:global]
                    # Admin users are always authorized
                    return true if admin?
                    # authorize if user has at least one role that has this permission
                    roles = memberships.collect {|m| m.roles}.flatten.uniq
                    roles.detect {|r| r.allowed_to?(action)} || (self.logged? ? Role.non_member.allowed_to?(action) : Role.anonymous.allowed_to?(action))
                  else
                    false
                  end
                end
                def self.current=(user)
                  @current_user = user
                end
                def self.current
                  @current_user ||= User.anonymous
                end
                # Returns the anonymous user.  If the anonymous user does not exist, it is created.  There can be only
                # one anonymous user per database.
                def self.anonymous
                  anonymous_user = AnonymousUser.find(:first)
                  if anonymous_user.nil?
                    anonymous_user = AnonymousUser.create(:lastname => 'Anonymous', :firstname => '', :mail => '', :login => '', :status => 0)
                    raise 'Unable to create the anonymous user.' if anonymous_user.new_record?
                  end
                  anonymous_user
                end
                protected
                def validate
                  # Password length validation based on setting
                  if !password.nil? && password.size < Setting.password_min_length.to_i
                    errors.add(:password, :too_short, :count => Setting.password_min_length.to_i)
                  end
                end
                private
                # Return password digest
                def self.hash_password(clear_password)
                  Digest::SHA1.hexdigest(clear_password || "")
                end
              end
              class AnonymousUser < User
                def validate_on_create
                  # There should be only one AnonymousUser in the database
                  errors.add_to_base 'An anonymous user already exists.' if AnonymousUser.find(:first)
                end
                def available_custom_fields
                  []
                end
                # Overrides a few properties
                def logged?; false end
                def admin; false end
                def name; 'Anonymous' end
                def mail; nil end
                def time_zone; nil end
                def rss_key; nil end
              end

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

              <h2><%=l(:label_administration)%></h2>
              <%= render :partial => 'no_data' if @no_configuration_data %>
              <p class="icon22 icon22-projects">
              <%= link_to l(:label_project_plural), :controller => 'admin', :action => 'projects' %> |
              <%= link_to l(:label_new), :controller => 'projects', :action => 'add' %>
              </p>
              <p class="icon22 icon22-users">
              <%= link_to l(:label_user_plural), :controller => 'users' %> |
              <%= 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>
              <p class="icon22 icon22-tracker">
              <%= link_to l(:label_tracker_plural), :controller => 'trackers' %> |
              <%= link_to l(:label_issue_status_plural), :controller => 'issue_statuses' %> |
              <%= link_to l(:label_workflow), :controller => 'workflows', :action => 'edit' %>
              </p>
              <p class="icon22 icon22-workflow">
              <%= link_to l(:label_custom_field_plural), :controller => 'custom_fields' %>
              </p>
              <p class="icon22 icon22-options">
              <%= link_to l(:label_enumerations), :controller => 'enumerations' %>
              </p>
              <p class="icon22 icon22-settings">
              <%= link_to l(:label_settings), :controller => 'settings' %>
              </p>
              <% menu_items_for(:admin_menu) do |item, caption, url, selected| -%>
                <%= content_tag 'p',
                  link_to(h(caption), item.url, item.html_options),
                  :class => ["icon22", "icon22-#{item.name}"].join(' ') %>
              <% end -%>
              <p class="icon22 icon22-plugin">
              <%= link_to l(:label_plugins), :controller => 'admin', :action => 'plugins' %>
              </p>
              <p class="icon22 icon22-info">
              <%= link_to l(:label_information_plural), :controller => 'admin', :action => 'info' %>
              </p>
              <% html_title(l(:label_administration)) -%>

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) %>
              	</thead>
              	<tbody>
              	<% 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') %>
                    <% remote_form_for(:member, member, :url => {:controller => 'members', :action => 'edit', :id => member},
                    																		: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 %>
                  <% 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>
              	</tbody>
              <% end; reset_cycle %>
              </table>
              <% else %>
              <p class="nodata"><%= l(:label_no_data) %></p>
              <% end %>
              </div>
-             <% users_count = User.active.count - @project.users.count
-                users = (users_count < 300) ? User.active.find(:all, :limit => 200).sort - @project.users : [] %>
+             <% principals = Principal.active.find(:all, :limit => 100, :order => 'type, login, lastname ASC') - @project.principals %>
              <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>
-             		<%= 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' });" %>
-             		<% unless users.empty? %>
-             			<div>
-             			<% users.each do |user| -%>
-             			<label><%= check_box_tag 'member[user_ids][]', user.id, false %> <%= user %></label>
-             			<% end -%>
-             			</div>
-             		<% end %>
+             		<p><%= text_field_tag 'principal_search', nil, :size => "40" %></p>
+             		<%= observe_field(:principal_search,
+                              :frequency => 0.5,
+                              :update => :principals,
+                              :url => { :controller => 'members', :action => 'autocomplete_for_member', :id => @project },
+                              :with => 'q')
+                               %>
+             		<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 %>
              <% end %>
              </div>

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

              <% roles = Role.find_all_givable %>
              <% projects = Project.active.find(:all, :order => 'lft') %>
              <div class="splitcontentleft">
              <% if @user.memberships.any? %>
              <table class="list memberships">
              	<thead>
              	  <th><%= l(:label_project) %></th>
              	  <th><%= l(:label_role_plural) %></th>
              	  <th style="width:15%"></th>
                    <%= call_hook(:view_users_memberships_table_header, :user => @user )%>
              	</thead>
              	<tbody>
              	<% @user.memberships.each do |membership| %>
              	<% next if membership.new_record? %>
              	<tr id="member-<%= membership.id %>" class="<%= cycle 'odd', 'even' %> class">
              	<td class="project"><%=h membership.project %></td>
                <td class="roles">
                  <span id="member-<%= membership.id %>-roles"><%=h membership.roles.sort.collect(&:to_s).join(', ') %></span>
                  <% 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>
              	</tbody>
              <% end; reset_cycle %>
              </table>
              <% else %>
              <p class="nodata"><%= l(:label_no_data) %></p>
              <% end %>
              </div>
              <div class="splitcontentright">
              <% if projects.any? %>
              <fieldset><legend><%=l(:label_project_new)%></legend>
              <% remote_form_for(:membership, :url => { :action => 'edit_membership', :id => @user }) do %>
              <%= select_tag 'membership[project_id]', options_for_membership_project_select(@user, projects) %>
              <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) %></p>
              <% end %>
              </fieldset>
              <% end %>
              </div>

config/locales/en.yml +3 0

              en:
                date:
                  formats:
                    # Use the strftime parameters for formats.
                    # When no format has been given, it uses default.
                    # You can provide other formats here if you like!
                    default: "%m/%d/%Y"
                    short: "%b %d"
                    long: "%B %d, %Y"
                  day_names: [Sunday, Monday, Tuesday, Wednesday, Thursday, Friday, Saturday]
                  abbr_day_names: [Sun, Mon, Tue, Wed, Thu, Fri, Sat]
                  # Don't forget the nil at the beginning; there's no such thing as a 0th month
                  month_names: [~, January, February, March, April, May, June, July, August, September, October, November, December]
                  abbr_month_names: [~, Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Oct, Nov, Dec]
                  # Used in date_select and datime_select.
                  order: [ :year, :month, :day ]
                time:
                  formats:
                    default: "%m/%d/%Y %I:%M %p"
                    time: "%I:%M %p"
                    short: "%d %b %H:%M"
                    long: "%B %d, %Y %H:%M"
                  am: "am"
                  pm: "pm"
                datetime:
                  distance_in_words:
                    half_a_minute: "half a minute"
                    less_than_x_seconds:
                      one:   "less than 1 second"
                      other: "less than {{count}} seconds"
                    x_seconds:
                      one:   "1 second"
                      other: "{{count}} seconds"
                    less_than_x_minutes:
                      one:   "less than a minute"
                      other: "less than {{count}} minutes"
                    x_minutes:
                      one:   "1 minute"
                      other: "{{count}} minutes"
                    about_x_hours:
                      one:   "about 1 hour"
                      other: "about {{count}} hours"
                    x_days:
                      one:   "1 day"
                      other: "{{count}} days"
                    about_x_months:
                      one:   "about 1 month"
                      other: "about {{count}} months"
                    x_months:
                      one:   "1 month"
                      other: "{{count}} months"
                    about_x_years:
                      one:   "about 1 year"
                      other: "about {{count}} years"
                    over_x_years:
                      one:   "over 1 year"
                      other: "over {{count}} years"
              # Used in array.to_sentence.
                support:
                  array:
                    sentence_connector: "and"
                    skip_last_comma: false
                activerecord:
                  errors:
                    messages:
                      inclusion: "is not included in the list"
                      exclusion: "is reserved"
                      invalid: "is invalid"
                      confirmation: "doesn't match confirmation"
                      accepted: "must be accepted"
                      empty: "can't be empty"
                      blank: "can't be blank"
                      too_long: "is too long (maximum is {{count}} characters)"
                      too_short: "is too short (minimum is {{count}} characters)"
                      wrong_length: "is the wrong length (should be {{count}} characters)"
                      taken: "has already been taken"
                      not_a_number: "is not a number"
                      not_a_date: "is not a valid date"
                      greater_than: "must be greater than {{count}}"
                      greater_than_or_equal_to: "must be greater than or equal to {{count}}"
                      equal_to: "must be equal to {{count}}"
                      less_than: "must be less than {{count}}"
                      less_than_or_equal_to: "must be less than or equal to {{count}}"
                      odd: "must be odd"
                      even: "must be even"
                      greater_than_start_date: "must be greater than start date"
                      not_same_project: "doesn't belong to the same project"
                      circular_dependency: "This relation would create a circular dependency"
                actionview_instancetag_blank_option: Please select
                general_text_No: 'No'
                general_text_Yes: 'Yes'
                general_text_no: 'no'
                general_text_yes: 'yes'
                general_lang_name: 'English'
                general_csv_separator: ','
                general_csv_decimal_separator: '.'
                general_csv_encoding: ISO-8859-1
                general_pdf_encoding: ISO-8859-1
                general_first_day_of_week: '7'
                notice_account_updated: Account was successfully updated.
                notice_account_invalid_creditentials: Invalid user or password
                notice_account_password_updated: Password was successfully updated.
                notice_account_wrong_password: Wrong password
                notice_account_register_done: Account was successfully created. To activate your account, click on the link that was emailed to you.
                notice_account_unknown_email: Unknown user.
                notice_can_t_change_password: This account uses an external authentication source. Impossible to change the password.
                notice_account_lost_email_sent: An email with instructions to choose a new password has been sent to you.
                notice_account_activated: Your account has been activated. You can now log in.
                notice_successful_create: Successful creation.
                notice_successful_update: Successful update.
                notice_successful_delete: Successful deletion.
                notice_successful_connection: Successful connection.
                notice_file_not_found: The page you were trying to access doesn't exist or has been removed.
                notice_locking_conflict: Data has been updated by another user.
                notice_not_authorized: You are not authorized to access this page.
                notice_email_sent: "An email was sent to {{value}}"
                notice_email_error: "An error occurred while sending mail ({{value}})"
                notice_feeds_access_key_reseted: Your RSS access key was reset.
                notice_failed_to_save_issues: "Failed to save {{count}} issue(s) on {{total}} selected: {{ids}}."
                notice_no_issue_selected: "No issue is selected! Please, check the issues you want to edit."
                notice_account_pending: "Your account was created and is now pending administrator approval."
                notice_default_data_loaded: Default configuration successfully loaded.
                notice_unable_delete_version: Unable to delete version.
                error_can_t_load_default_data: "Default configuration could not be loaded: {{value}}"
                error_scm_not_found: "The entry or revision was not found in the repository."
                error_scm_command_failed: "An error occurred when trying to access the repository: {{value}}"
                error_scm_annotate: "The entry does not exist or can not be annotated."
                error_issue_not_found_in_project: 'The issue was not found or does not belong to this project'
                error_no_tracker_in_project: 'No tracker is associated to this project. Please check the Project settings.'
                error_no_default_issue_status: 'No default issue status is defined. Please check your configuration (Go to "Administration -> Issue statuses").'
                warning_attachments_not_saved: "{{count}} file(s) could not be saved."
                mail_subject_lost_password: "Your {{value}} password"
                mail_body_lost_password: 'To change your password, click on the following link:'
                mail_subject_register: "Your {{value}} account activation"
                mail_body_register: 'To activate your account, click on the following link:'
                mail_body_account_information_external: "You can use your {{value}} account to log in."
                mail_body_account_information: Your account information
                mail_subject_account_activation_request: "{{value}} account activation request"
                mail_body_account_activation_request: "A new user ({{value}}) has registered. The account is pending your approval:"
                mail_subject_reminder: "{{count}} issue(s) due in the next days"
                mail_body_reminder: "{{count}} issue(s) that are assigned to you are due in the next {{days}} days:"
                mail_subject_wiki_content_added: "'{{page}}' wiki page has been added"
                mail_body_wiki_content_added: "The '{{page}}' wiki page has been added by {{author}}."
                mail_subject_wiki_content_updated: "'{{page}}' wiki page has been updated"
                mail_body_wiki_content_updated: "The '{{page}}' wiki page has been updated by {{author}}."
                gui_validation_error: 1 error
                gui_validation_error_plural: "{{count}} errors"
                field_name: Name
                field_description: Description
                field_summary: Summary
                field_is_required: Required
                field_firstname: Firstname
                field_lastname: Lastname
                field_mail: Email
                field_filename: File
                field_filesize: Size
                field_downloads: Downloads
                field_author: Author
                field_created_on: Created
                field_updated_on: Updated
                field_field_format: Format
                field_is_for_all: For all projects
                field_possible_values: Possible values
                field_regexp: Regular expression
                field_min_length: Minimum length
                field_max_length: Maximum length
                field_value: Value
                field_category: Category
                field_title: Title
                field_project: Project
                field_issue: Issue
                field_status: Status
                field_notes: Notes
                field_is_closed: Issue closed
                field_is_default: Default value
                field_tracker: Tracker
                field_subject: Subject
                field_due_date: Due date
                field_assigned_to: Assigned to
                field_priority: Priority
                field_fixed_version: Target version
                field_user: User
                field_role: Role
                field_homepage: Homepage
                field_is_public: Public
                field_parent: Subproject of
                field_is_in_chlog: Issues displayed in changelog
                field_is_in_roadmap: Issues displayed in roadmap
                field_login: Login
                field_mail_notification: Email notifications
                field_admin: Administrator
                field_last_login_on: Last connection
                field_language: Language
                field_effective_date: Date
                field_password: Password
                field_new_password: New password
                field_password_confirmation: Confirmation
                field_version: Version
                field_type: Type
                field_host: Host
                field_port: Port
                field_account: Account
                field_base_dn: Base DN
                field_attr_login: Login attribute
                field_attr_firstname: Firstname attribute
                field_attr_lastname: Lastname attribute
                field_attr_mail: Email attribute
                field_onthefly: On-the-fly user creation
                field_start_date: Start
                field_done_ratio: % Done
                field_auth_source: Authentication mode
                field_hide_mail: Hide my email address
                field_comments: Comment
                field_url: URL
                field_start_page: Start page
                field_subproject: Subproject
                field_hours: Hours
                field_activity: Activity
                field_spent_on: Date
                field_identifier: Identifier
                field_is_filter: Used as a filter
                field_issue_to: Related issue
                field_delay: Delay
                field_assignable: Issues can be assigned to this role
                field_redirect_existing_links: Redirect existing links
                field_estimated_hours: Estimated time
                field_column_names: Columns
                field_time_zone: Time zone
                field_searchable: Searchable
                field_default_value: Default value
                field_comments_sorting: Display comments
                field_parent_title: Parent page
                field_editable: Editable
                field_watcher: Watcher
                field_identity_url: OpenID URL
                field_content: Content
                field_group_by: Group results by
                setting_app_title: Application title
                setting_app_subtitle: Application subtitle
                setting_welcome_text: Welcome text
                setting_default_language: Default language
                setting_login_required: Authentication required
                setting_self_registration: Self-registration
                setting_attachment_max_size: Attachment max. size
                setting_issues_export_limit: Issues export limit
                setting_mail_from: Emission email address
                setting_bcc_recipients: Blind carbon copy recipients (bcc)
                setting_plain_text_mail: Plain text mail (no HTML)
                setting_host_name: Host name and path
                setting_text_formatting: Text formatting
                setting_wiki_compression: Wiki history compression
                setting_feeds_limit: Feed content limit
                setting_default_projects_public: New projects are public by default
                setting_autofetch_changesets: Autofetch commits
                setting_sys_api_enabled: Enable WS for repository management
                setting_commit_ref_keywords: Referencing keywords
                setting_commit_fix_keywords: Fixing keywords
                setting_autologin: Autologin
                setting_date_format: Date format
                setting_time_format: Time format
                setting_cross_project_issue_relations: Allow cross-project issue relations
                setting_issue_list_default_columns: Default columns displayed on the issue list
                setting_repositories_encodings: Repositories encodings
                setting_commit_logs_encoding: Commit messages encoding
                setting_emails_footer: Emails footer
                setting_protocol: Protocol
                setting_per_page_options: Objects per page options
                setting_user_format: Users display format
                setting_activity_days_default: Days displayed on project activity
                setting_display_subprojects_issues: Display subprojects issues on main projects by default
                setting_enabled_scm: Enabled SCM
                setting_mail_handler_api_enabled: Enable WS for incoming emails
                setting_mail_handler_api_key: API key
                setting_sequential_project_identifiers: Generate sequential project identifiers
                setting_gravatar_enabled: Use Gravatar user icons
                setting_diff_max_lines_displayed: Max number of diff lines displayed
                setting_file_max_size_displayed: Max size of text files displayed inline
                setting_repository_log_display_limit: Maximum number of revisions displayed on file log
                setting_openid: Allow OpenID login and registration
                setting_password_min_length: Minimum password length
                setting_new_project_user_role_id: Role given to a non-admin user who creates a project
                permission_add_project: Create project
                permission_edit_project: Edit project
                permission_select_project_modules: Select project modules
                permission_manage_members: Manage members
                permission_manage_versions: Manage versions
                permission_manage_categories: Manage issue categories
                permission_add_issues: Add issues
                permission_edit_issues: Edit issues
                permission_manage_issue_relations: Manage issue relations
                permission_add_issue_notes: Add notes
                permission_edit_issue_notes: Edit notes
                permission_edit_own_issue_notes: Edit own notes
                permission_move_issues: Move issues
                permission_delete_issues: Delete issues
                permission_manage_public_queries: Manage public queries
                permission_save_queries: Save queries
                permission_view_gantt: View gantt chart
                permission_view_calendar: View calender
                permission_view_issue_watchers: View watchers list
                permission_add_issue_watchers: Add watchers
                permission_log_time: Log spent time
                permission_view_time_entries: View spent time
                permission_edit_time_entries: Edit time logs
                permission_edit_own_time_entries: Edit own time logs
                permission_manage_news: Manage news
                permission_comment_news: Comment news
                permission_manage_documents: Manage documents
                permission_view_documents: View documents
                permission_manage_files: Manage files
                permission_view_files: View files
                permission_manage_wiki: Manage wiki
                permission_rename_wiki_pages: Rename wiki pages
                permission_delete_wiki_pages: Delete wiki pages
                permission_view_wiki_pages: View wiki
                permission_view_wiki_edits: View wiki history
                permission_edit_wiki_pages: Edit wiki pages
                permission_delete_wiki_pages_attachments: Delete attachments
                permission_protect_wiki_pages: Protect wiki pages
                permission_manage_repository: Manage repository
                permission_browse_repository: Browse repository
                permission_view_changesets: View changesets
                permission_commit_access: Commit access
                permission_manage_boards: Manage boards
                permission_view_messages: View messages
                permission_add_messages: Post messages
                permission_edit_messages: Edit messages
                permission_edit_own_messages: Edit own messages
                permission_delete_messages: Delete messages
                permission_delete_own_messages: Delete own messages
                project_module_issue_tracking: Issue tracking
                project_module_time_tracking: Time tracking
                project_module_news: News
                project_module_documents: Documents
                project_module_files: Files
                project_module_wiki: Wiki
                project_module_repository: Repository
                project_module_boards: Boards
                label_user: User
                label_user_plural: Users
                label_user_new: New user
                label_project: Project
                label_project_new: New project
                label_project_plural: Projects
                label_x_projects:
                  zero:  no projects
                  one:   1 project
                  other: "{{count}} projects"
                label_project_all: All Projects
                label_project_latest: Latest projects
                label_issue: Issue
                label_issue_new: New issue
                label_issue_plural: Issues
                label_issue_view_all: View all issues
                label_issues_by: "Issues by {{value}}"
                label_issue_added: Issue added
                label_issue_updated: Issue updated
                label_document: Document
                label_document_new: New document
                label_document_plural: Documents
                label_document_added: Document added
                label_role: Role
                label_role_plural: Roles
                label_role_new: New role
                label_role_and_permissions: Roles and permissions
                label_member: Member
                label_member_new: New member
                label_member_plural: Members
                label_tracker: Tracker
                label_tracker_plural: Trackers
                label_tracker_new: New tracker
                label_workflow: Workflow
                label_issue_status: Issue status
                label_issue_status_plural: Issue statuses
                label_issue_status_new: New status
                label_issue_category: Issue category
                label_issue_category_plural: Issue categories
                label_issue_category_new: New category
                label_custom_field: Custom field
                label_custom_field_plural: Custom fields
                label_custom_field_new: New custom field
                label_enumerations: Enumerations
                label_enumeration_new: New value
                label_information: Information
                label_information_plural: Information
                label_please_login: Please log in
                label_register: Register
                label_login_with_open_id_option: or login with OpenID
                label_password_lost: Lost password
                label_home: Home
                label_my_page: My page
                label_my_account: My account
                label_my_projects: My projects
                label_administration: Administration
                label_login: Sign in
                label_logout: Sign out
                label_help: Help
                label_reported_issues: Reported issues
                label_assigned_to_me_issues: Issues assigned to me
                label_last_login: Last connection
                label_registered_on: Registered on
                label_activity: Activity
                label_overall_activity: Overall activity
                label_user_activity: "{{value}}'s activity"
                label_new: New
                label_logged_as: Logged in as
                label_environment: Environment
                label_authentication: Authentication
                label_auth_source: Authentication mode
                label_auth_source_new: New authentication mode
                label_auth_source_plural: Authentication modes
                label_subproject_plural: Subprojects
                label_and_its_subprojects: "{{value}} and its subprojects"
                label_min_max_length: Min - Max length
                label_list: List
                label_date: Date
                label_integer: Integer
                label_float: Float
                label_boolean: Boolean
                label_string: Text
                label_text: Long text
                label_attribute: Attribute
                label_attribute_plural: Attributes
                label_download: "{{count}} Download"
                label_download_plural: "{{count}} Downloads"
                label_no_data: No data to display
                label_change_status: Change status
                label_history: History
                label_attachment: File
                label_attachment_new: New file
                label_attachment_delete: Delete file
                label_attachment_plural: Files
                label_file_added: File added
                label_report: Report
                label_report_plural: Reports
                label_news: News
                label_news_new: Add news
                label_news_plural: News
                label_news_latest: Latest news
                label_news_view_all: View all news
                label_news_added: News added
                label_change_log: Change log
                label_settings: Settings
                label_overview: Overview
                label_version: Version
                label_version_new: New version
                label_version_plural: Versions
                label_confirmation: Confirmation
                label_export_to: 'Also available in:'
                label_read: Read...
                label_public_projects: Public projects
                label_open_issues: open
                label_open_issues_plural: open
                label_closed_issues: closed
                label_closed_issues_plural: closed
                label_x_open_issues_abbr_on_total:
                  zero:  0 open / {{total}}
                  one:   1 open / {{total}}
                  other: "{{count}} open / {{total}}"
                label_x_open_issues_abbr:
                  zero:  0 open
                  one:   1 open
                  other: "{{count}} open"
                label_x_closed_issues_abbr:
                  zero:  0 closed
                  one:   1 closed
                  other: "{{count}} closed"
                label_total: Total
                label_permissions: Permissions
                label_current_status: Current status
                label_new_statuses_allowed: New statuses allowed
                label_all: all
                label_none: none
                label_nobody: nobody
                label_next: Next
                label_previous: Previous
                label_used_by: Used by
                label_details: Details
                label_add_note: Add a note
                label_per_page: Per page
                label_calendar: Calendar
                label_months_from: months from
                label_gantt: Gantt
                label_internal: Internal
                label_last_changes: "last {{count}} changes"
                label_change_view_all: View all changes
                label_personalize_page: Personalize this page
                label_comment: Comment
                label_comment_plural: Comments
                label_x_comments:
                  zero: no comments
                  one: 1 comment
                  other: "{{count}} comments"
                label_comment_add: Add a comment
                label_comment_added: Comment added
                label_comment_delete: Delete comments
                label_query: Custom query
                label_query_plural: Custom queries
                label_query_new: New query
                label_filter_add: Add filter
                label_filter_plural: Filters
                label_equals: is
                label_not_equals: is not
                label_in_less_than: in less than
                label_in_more_than: in more than
                label_greater_or_equal: '>='
                label_less_or_equal: '<='
                label_in: in
                label_today: today
                label_all_time: all time
                label_yesterday: yesterday
                label_this_week: this week
                label_last_week: last week
                label_last_n_days: "last {{count}} days"
                label_this_month: this month
                label_last_month: last month
                label_this_year: this year
                label_date_range: Date range
                label_less_than_ago: less than days ago
                label_more_than_ago: more than days ago
                label_ago: days ago
                label_contains: contains
                label_not_contains: doesn't contain
                label_day_plural: days
                label_repository: Repository
                label_repository_plural: Repositories
                label_browse: Browse
                label_modification: "{{count}} change"
                label_modification_plural: "{{count}} changes"
                label_branch: Branch
                label_tag: Tag
                label_revision: Revision
                label_revision_plural: Revisions
                label_associated_revisions: Associated revisions
                label_added: added
                label_modified: modified
                label_copied: copied
                label_renamed: renamed
                label_deleted: deleted
                label_latest_revision: Latest revision
                label_latest_revision_plural: Latest revisions
                label_view_revisions: View revisions
                label_view_all_revisions: View all revisions
                label_max_size: Maximum size
                label_sort_highest: Move to top
                label_sort_higher: Move up
                label_sort_lower: Move down
                label_sort_lowest: Move to bottom
                label_roadmap: Roadmap
                label_roadmap_due_in: "Due in {{value}}"
                label_roadmap_overdue: "{{value}} late"
                label_roadmap_no_issues: No issues for this version
                label_search: Search
                label_result_plural: Results
                label_all_words: All words
                label_wiki: Wiki
                label_wiki_edit: Wiki edit
                label_wiki_edit_plural: Wiki edits
                label_wiki_page: Wiki page
                label_wiki_page_plural: Wiki pages
                label_index_by_title: Index by title
                label_index_by_date: Index by date
                label_current_version: Current version
                label_preview: Preview
                label_feed_plural: Feeds
                label_changes_details: Details of all changes
                label_issue_tracking: Issue tracking
                label_spent_time: Spent time
                label_f_hour: "{{value}} hour"
                label_f_hour_plural: "{{value}} hours"
                label_time_tracking: Time tracking
                label_change_plural: Changes
                label_statistics: Statistics
                label_commits_per_month: Commits per month
                label_commits_per_author: Commits per author
                label_view_diff: View differences
                label_diff_inline: inline
                label_diff_side_by_side: side by side
                label_options: Options
                label_copy_workflow_from: Copy workflow from
                label_permissions_report: Permissions report
                label_watched_issues: Watched issues
                label_related_issues: Related issues
                label_applied_status: Applied status
                label_loading: Loading...
                label_relation_new: New relation
                label_relation_delete: Delete relation
                label_relates_to: related to
                label_duplicates: duplicates
                label_duplicated_by: duplicated by
                label_blocks: blocks
                label_blocked_by: blocked by
                label_precedes: precedes
                label_follows: follows
                label_end_to_start: end to start
                label_end_to_end: end to end
                label_start_to_start: start to start
                label_start_to_end: start to end
                label_stay_logged_in: Stay logged in
                label_disabled: disabled
                label_show_completed_versions: Show completed versions
                label_me: me
                label_board: Forum
                label_board_new: New forum
                label_board_plural: Forums
                label_topic_plural: Topics
                label_message_plural: Messages
                label_message_last: Last message
                label_message_new: New message
                label_message_posted: Message added
                label_reply_plural: Replies
                label_send_information: Send account information to the user
                label_year: Year
                label_month: Month
                label_week: Week
                label_date_from: From
                label_date_to: To
                label_language_based: Based on user's language
                label_sort_by: "Sort by {{value}}"
                label_send_test_email: Send a test email
                label_feeds_access_key_created_on: "RSS access key created {{value}} ago"
                label_module_plural: Modules
                label_added_time_by: "Added by {{author}} {{age}} ago"
                label_updated_time_by: "Updated by {{author}} {{age}} ago"
                label_updated_time: "Updated {{value}} ago"
                label_jump_to_a_project: Jump to a project...
                label_file_plural: Files
                label_changeset_plural: Changesets
                label_default_columns: Default columns
                label_no_change_option: (No change)
                label_bulk_edit_selected_issues: Bulk edit selected issues
                label_theme: Theme
                label_default: Default
                label_search_titles_only: Search titles only
                label_user_mail_option_all: "For any event on all my projects"
                label_user_mail_option_selected: "For any event on the selected projects only..."
                label_user_mail_option_none: "Only for things I watch or I'm involved in"
                label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"
                label_registration_activation_by_email: account activation by email
                label_registration_manual_activation: manual account activation
                label_registration_automatic_activation: automatic account activation
                label_display_per_page: "Per page: {{value}}"
                label_age: Age
                label_change_properties: Change properties
                label_general: General
                label_more: More
                label_scm: SCM
                label_plugins: Plugins
                label_ldap_authentication: LDAP authentication
                label_downloads_abbr: D/L
                label_optional_description: Optional description
                label_add_another_file: Add another file
                label_preferences: Preferences
                label_chronological_order: In chronological order
                label_reverse_chronological_order: In reverse chronological order
                label_planning: Planning
                label_incoming_emails: Incoming emails
                label_generate_key: Generate a key
                label_issue_watchers: Watchers
                label_example: Example
                label_display: Display
                label_sort: Sort
                label_ascending: Ascending
                label_descending: Descending
                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
                button_save: Save
                button_check_all: Check all
                button_uncheck_all: Uncheck all
                button_delete: Delete
                button_create: Create
                button_create_and_continue: Create and continue
                button_test: Test
                button_edit: Edit
                button_add: Add
                button_change: Change
                button_apply: Apply
                button_clear: Clear
                button_lock: Lock
                button_unlock: Unlock
                button_download: Download
                button_list: List
                button_view: View
                button_move: Move
                button_back: Back
                button_cancel: Cancel
                button_activate: Activate
                button_sort: Sort
                button_log_time: Log time
                button_rollback: Rollback to this version
                button_watch: Watch
                button_unwatch: Unwatch
                button_reply: Reply
                button_archive: Archive
                button_unarchive: Unarchive
                button_reset: Reset
                button_rename: Rename
                button_change_password: Change password
                button_copy: Copy
                button_annotate: Annotate
                button_update: Update
                button_configure: Configure
                button_quote: Quote
                status_active: active
                status_registered: registered
                status_locked: locked
                text_select_mail_notifications: Select actions for which email notifications should be sent.
                text_regexp_info: eg. ^[A-Z0-9]+$
                text_min_max_length_info: 0 means no restriction
                text_project_destroy_confirmation: Are you sure you want to delete this project and related data ?
                text_subprojects_destroy_warning: "Its subproject(s): {{value}} will be also deleted."
                text_workflow_edit: Select a role and a tracker to edit the workflow
                text_are_you_sure: Are you sure ?
                text_journal_changed: "{{label}} changed from {{old}} to {{new}}"
                text_journal_set_to: "{{label}} set to {{value}}"
                text_journal_deleted: "{{label}} deleted"
                text_tip_task_begin_day: task beginning this day
                text_tip_task_end_day: task ending this day
                text_tip_task_begin_end_day: task beginning and ending this day
                text_project_identifier_info: 'Only lower case letters (a-z), numbers and dashes are allowed.<br />Once saved, the identifier can not be changed.'
                text_caracters_maximum: "{{count}} characters maximum."
                text_caracters_minimum: "Must be at least {{count}} characters long."
                text_length_between: "Length between {{min}} and {{max}} characters."
                text_tracker_no_workflow: No workflow defined for this tracker
                text_unallowed_characters: Unallowed characters
                text_comma_separated: Multiple values allowed (comma separated).
                text_issues_ref_in_commit_messages: Referencing and fixing issues in commit messages
                text_issue_added: "Issue {{id}} has been reported by {{author}}."
                text_issue_updated: "Issue {{id}} has been updated by {{author}}."
                text_wiki_destroy_confirmation: Are you sure you want to delete this wiki and all its content ?
                text_issue_category_destroy_question: "Some issues ({{count}}) are assigned to this category. What do you want to do ?"
                text_issue_category_destroy_assignments: Remove category assignments
                text_issue_category_reassign_to: Reassign issues to this category
                text_user_mail_option: "For unselected projects, you will only receive notifications about things you watch or you're involved in (eg. issues you're the author or assignee)."
                text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
                text_load_default_configuration: Load the default configuration
                text_status_changed_by_changeset: "Applied in changeset {{value}}."
                text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?'
                text_select_project_modules: 'Select modules to enable for this project:'
                text_default_administrator_account_changed: Default administrator account changed
                text_file_repository_writable: Attachments directory writable
                text_plugin_assets_writable: Plugin assets directory writable
                text_rmagick_available: RMagick available (optional)
                text_destroy_time_entries_question: "{{hours}} hours were reported on the issues you are about to delete. What do you want to do ?"
                text_destroy_time_entries: Delete reported hours
                text_assign_time_entries_to_project: Assign reported hours to the project
                text_reassign_time_entries: 'Reassign reported hours to this issue:'
                text_user_wrote: "{{value}} wrote:"
                text_enumeration_destroy_question: "{{count}} objects are assigned to this value."
                text_enumeration_category_reassign_to: 'Reassign them to this value:'
                text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
                text_repository_usernames_mapping: "Select or update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
                text_diff_truncated: '... This diff was truncated because it exceeds the maximum size that can be displayed.'
                text_custom_field_possible_values_info: 'One line for each value'
                text_wiki_page_destroy_question: "This page has {{descendants}} child page(s) and descendant(s). What do you want to do?"
                text_wiki_page_nullify_children: "Keep child pages as root pages"
                text_wiki_page_destroy_children: "Delete child pages and all their descendants"
                text_wiki_page_reassign_children: "Reassign child pages to this parent page"
                default_role_manager: Manager
                default_role_developper: Developer
                default_role_reporter: Reporter
                default_tracker_bug: Bug
                default_tracker_feature: Feature
                default_tracker_support: Support
                default_issue_status_new: New
                default_issue_status_assigned: Assigned
                default_issue_status_resolved: Resolved
                default_issue_status_feedback: Feedback
                default_issue_status_closed: Closed
                default_issue_status_rejected: Rejected
                default_doc_category_user: User documentation
                default_doc_category_tech: Technical documentation
                default_priority_low: Low
                default_priority_normal: Normal
                default_priority_high: High
                default_priority_urgent: Urgent
                default_priority_immediate: Immediate
                default_activity_design: Design
                default_activity_development: Development
                enumeration_issue_priorities: Issue priorities
                enumeration_doc_categories: Document categories
                enumeration_activities: Activities (time tracking)

config/routes.rb +2 -1

              ActionController::Routing::Routes.draw do |map|
                # Add your own custom routes here.
                # The priority is based upon order of creation: first created -> highest priority.
                # Here's a sample route:
                # map.connect 'products/:id', :controller => 'catalog', :action => 'view'
                # Keep in mind you can assign values other than :controller and :action
                # Allow Redmine plugins to map routes and potentially override them
                Rails.plugins.each do |plugin|
                  map.from_plugin plugin.name.to_sym
                end
                map.home '', :controller => 'welcome'
                map.signin 'login', :controller => 'account', :action => 'login'
                map.signout 'logout', :controller => 'account', :action => 'logout'
                map.connect 'roles/workflow/:id/:role_id/:tracker_id', :controller => 'roles', :action => 'workflow'
                map.connect 'help/:ctrl/:page', :controller => 'help'
                map.connect 'time_entries/:id/edit', :action => 'edit', :controller => 'timelog'
                map.connect 'projects/:project_id/time_entries/new', :action => 'edit', :controller => 'timelog'
                map.connect 'projects/:project_id/issues/:issue_id/time_entries/new', :action => 'edit', :controller => 'timelog'
                map.with_options :controller => 'timelog' do |timelog|
                  timelog.connect 'projects/:project_id/time_entries', :action => 'details'
                  timelog.with_options :action => 'details', :conditions => {:method => :get}  do |time_details|
                    time_details.connect 'time_entries'
                    time_details.connect 'time_entries.:format'
                    time_details.connect 'issues/:issue_id/time_entries'
                    time_details.connect 'issues/:issue_id/time_entries.:format'
                    time_details.connect 'projects/:project_id/time_entries.:format'
                    time_details.connect 'projects/:project_id/issues/:issue_id/time_entries'
                    time_details.connect 'projects/:project_id/issues/:issue_id/time_entries.:format'
                  end
                  timelog.connect 'projects/:project_id/time_entries/report', :action => 'report'
                  timelog.with_options :action => 'report',:conditions => {:method => :get} do |time_report|
                    time_report.connect 'time_entries/report'
                    time_report.connect 'time_entries/report.:format'
                    time_report.connect 'projects/:project_id/time_entries/report.:format'
                  end
                  timelog.with_options :action => 'edit', :conditions => {:method => :get} do |time_edit|
                    time_edit.connect 'issues/:issue_id/time_entries/new'
                  end
                  timelog.connect 'time_entries/:id/destroy', :action => 'destroy', :conditions => {:method => :post}
                end
                map.connect 'projects/:id/wiki', :controller => 'wikis', :action => 'edit', :conditions => {:method => :post}
                map.connect 'projects/:id/wiki/destroy', :controller => 'wikis', :action => 'destroy', :conditions => {:method => :get}
                map.connect 'projects/:id/wiki/destroy', :controller => 'wikis', :action => 'destroy', :conditions => {:method => :post}
                map.with_options :controller => 'wiki' do |wiki_routes|
                  wiki_routes.with_options :conditions => {:method => :get} do |wiki_views|
                    wiki_views.connect 'projects/:id/wiki/:page', :action => 'special', :page => /page_index|date_index|export/i
                    wiki_views.connect 'projects/:id/wiki/:page', :action => 'index', :page => nil
                    wiki_views.connect 'projects/:id/wiki/:page/edit', :action => 'edit'
                    wiki_views.connect 'projects/:id/wiki/:page/rename', :action => 'rename'
                    wiki_views.connect 'projects/:id/wiki/:page/history', :action => 'history'
                    wiki_views.connect 'projects/:id/wiki/:page/diff/:version/vs/:version_from', :action => 'diff'
                    wiki_views.connect 'projects/:id/wiki/:page/annotate/:version', :action => 'annotate'
                  end
                  wiki_routes.connect 'projects/:id/wiki/:page/:action',
                    :action => /edit|rename|destroy|preview|protect/,
                    :conditions => {:method => :post}
                end
                map.with_options :controller => 'messages' do |messages_routes|
                  messages_routes.with_options :conditions => {:method => :get} do |messages_views|
                    messages_views.connect 'boards/:board_id/topics/new', :action => 'new'
                    messages_views.connect 'boards/:board_id/topics/:id', :action => 'show'
                    messages_views.connect 'boards/:board_id/topics/:id/edit', :action => 'edit'
                  end
                  messages_routes.with_options :conditions => {:method => :post} do |messages_actions|
                    messages_actions.connect 'boards/:board_id/topics/new', :action => 'new'
                    messages_actions.connect 'boards/:board_id/topics/:id/replies', :action => 'reply'
                    messages_actions.connect 'boards/:board_id/topics/:id/:action', :action => /edit|destroy/
                  end
                end
                map.with_options :controller => 'boards' do |board_routes|
                  board_routes.with_options :conditions => {:method => :get} do |board_views|
                    board_views.connect 'projects/:project_id/boards', :action => 'index'
                    board_views.connect 'projects/:project_id/boards/new', :action => 'new'
                    board_views.connect 'projects/:project_id/boards/:id', :action => 'show'
                    board_views.connect 'projects/:project_id/boards/:id.:format', :action => 'show'
                    board_views.connect 'projects/:project_id/boards/:id/edit', :action => 'edit'
                  end
                  board_routes.with_options :conditions => {:method => :post} do |board_actions|
                    board_actions.connect 'projects/:project_id/boards', :action => 'new'
                    board_actions.connect 'projects/:project_id/boards/:id/:action', :action => /edit|destroy/
                  end
                end
                map.with_options :controller => 'documents' do |document_routes|
                  document_routes.with_options :conditions => {:method => :get} do |document_views|
                    document_views.connect 'projects/:project_id/documents', :action => 'index'
                    document_views.connect 'projects/:project_id/documents/new', :action => 'new'
                    document_views.connect 'documents/:id', :action => 'show'
                    document_views.connect 'documents/:id/edit', :action => 'edit'
                  end
                  document_routes.with_options :conditions => {:method => :post} do |document_actions|
                    document_actions.connect 'projects/:project_id/documents', :action => 'new'
                    document_actions.connect 'documents/:id/:action', :action => /destroy|edit/
                  end
                end
                map.with_options :controller => 'issues' do |issues_routes|
                  issues_routes.with_options :conditions => {:method => :get} do |issues_views|
                    issues_views.connect 'issues', :action => 'index'
                    issues_views.connect 'issues.:format', :action => 'index'
                    issues_views.connect 'projects/:project_id/issues', :action => 'index'
                    issues_views.connect 'projects/:project_id/issues.:format', :action => 'index'
                    issues_views.connect 'projects/:project_id/issues/new', :action => 'new'
                    issues_views.connect 'projects/:project_id/issues/gantt', :action => 'gantt'
                    issues_views.connect 'projects/:project_id/issues/calendar', :action => 'calendar'
                    issues_views.connect 'projects/:project_id/issues/:copy_from/copy', :action => 'new'
                    issues_views.connect 'issues/:id', :action => 'show', :id => /\d+/
                    issues_views.connect 'issues/:id.:format', :action => 'show', :id => /\d+/
                    issues_views.connect 'issues/:id/edit', :action => 'edit', :id => /\d+/
                    issues_views.connect 'issues/:id/move', :action => 'move', :id => /\d+/
                  end
                  issues_routes.with_options :conditions => {:method => :post} do |issues_actions|
                    issues_actions.connect 'projects/:project_id/issues', :action => 'new'
                    issues_actions.connect 'issues/:id/quoted', :action => 'reply', :id => /\d+/
                    issues_actions.connect 'issues/:id/:action', :action => /edit|move|destroy/, :id => /\d+/
                  end
                  issues_routes.connect 'issues/:action'
                end
                map.with_options  :controller => 'issue_relations', :conditions => {:method => :post} do |relations|
                  relations.connect 'issues/:issue_id/relations/:id', :action => 'new'
                  relations.connect 'issues/:issue_id/relations/:id/destroy', :action => 'destroy'
                end
                map.with_options :controller => 'reports', :action => 'issue_report', :conditions => {:method => :get} do |reports|
                  reports.connect 'projects/:id/issues/report'
                  reports.connect 'projects/:id/issues/report/:detail'
                end
                map.with_options :controller => 'news' do |news_routes|
                  news_routes.with_options :conditions => {:method => :get} do |news_views|
                    news_views.connect 'news', :action => 'index'
                    news_views.connect 'projects/:project_id/news', :action => 'index'
                    news_views.connect 'projects/:project_id/news.:format', :action => 'index'
                    news_views.connect 'news.:format', :action => 'index'
                    news_views.connect 'projects/:project_id/news/new', :action => 'new'
                    news_views.connect 'news/:id', :action => 'show'
                    news_views.connect 'news/:id/edit', :action => 'edit'
                  end
                  news_routes.with_options do |news_actions|
                    news_actions.connect 'projects/:project_id/news', :action => 'new'
                    news_actions.connect 'news/:id/edit', :action => 'edit'
                    news_actions.connect 'news/:id/destroy', :action => 'destroy'
                  end
                end
                map.connect 'projects/:id/members/new', :controller => 'members', :action => 'new'
                map.with_options :controller => 'users' do |users|
                  users.with_options :conditions => {:method => :get} do |user_views|
                    user_views.connect 'users', :action => 'list'
                    user_views.connect 'users', :action => 'index'
                    user_views.connect 'users/new', :action => 'add'
                    user_views.connect 'users/:id/edit/:tab', :action => 'edit', :tab => nil
                  end
                  users.with_options :conditions => {:method => :post} do |user_actions|
                    user_actions.connect 'users', :action => 'add'
                    user_actions.connect 'users/new', :action => 'add'
                    user_actions.connect 'users/:id/edit', :action => 'edit'
                    user_actions.connect 'users/:id/memberships', :action => 'edit_membership'
                    user_actions.connect 'users/:id/memberships/:membership_id', :action => 'edit_membership'
                    user_actions.connect 'users/:id/memberships/:membership_id/destroy', :action => 'destroy_membership'
                  end
                end
                map.with_options :controller => 'projects' do |projects|
                  projects.with_options :conditions => {:method => :get} do |project_views|
                    project_views.connect 'projects', :action => 'index'
                    project_views.connect 'projects.:format', :action => 'index'
                    project_views.connect 'projects/new', :action => 'add'
                    project_views.connect 'projects/:id', :action => 'show'
                    project_views.connect 'projects/:id/:action', :action => /roadmap|changelog|destroy|settings/
                    project_views.connect 'projects/:id/files', :action => 'list_files'
                    project_views.connect 'projects/:id/files/new', :action => 'add_file'
                    project_views.connect 'projects/:id/versions/new', :action => 'add_version'
                    project_views.connect 'projects/:id/categories/new', :action => 'add_issue_category'
                    project_views.connect 'projects/:id/settings/:tab', :action => 'settings'
                  end
                  projects.with_options :action => 'activity', :conditions => {:method => :get} do |activity|
                    activity.connect 'projects/:id/activity'
                    activity.connect 'projects/:id/activity.:format'
                    activity.connect 'activity', :id => nil
                    activity.connect 'activity.:format', :id => nil
                  end
                  projects.with_options :conditions => {:method => :post} do |project_actions|
                    project_actions.connect 'projects/new', :action => 'add'
                    project_actions.connect 'projects', :action => 'add'
                    project_actions.connect 'projects/:id/:action', :action => /destroy|archive|unarchive/
                    project_actions.connect 'projects/:id/files/new', :action => 'add_file'
                    project_actions.connect 'projects/:id/versions/new', :action => 'add_version'
                    project_actions.connect 'projects/:id/categories/new', :action => 'add_issue_category'
                  end
                end
                map.with_options :controller => 'repositories' do |repositories|
                  repositories.with_options :conditions => {:method => :get} do |repository_views|
                    repository_views.connect 'projects/:id/repository', :action => 'show'
                    repository_views.connect 'projects/:id/repository/edit', :action => 'edit'
                    repository_views.connect 'projects/:id/repository/statistics', :action => 'stats'
                    repository_views.connect 'projects/:id/repository/revisions', :action => 'revisions'
                    repository_views.connect 'projects/:id/repository/revisions.:format', :action => 'revisions'
                    repository_views.connect 'projects/:id/repository/revisions/:rev', :action => 'revision'
                    repository_views.connect 'projects/:id/repository/revisions/:rev/diff', :action => 'diff'
                    repository_views.connect 'projects/:id/repository/revisions/:rev/diff.:format', :action => 'diff'
                    repository_views.connect 'projects/:id/repository/revisions/:rev/:action/*path', :requirements => { :rev => /[a-z0-9\.\-_]+/ }
                    repository_views.connect 'projects/:id/repository/:action/*path'
                  end
                  repositories.connect 'projects/:id/repository/:action', :conditions => {:method => :post}
                end
                map.connect 'attachments/:id', :controller => 'attachments', :action => 'show', :id => /\d+/
                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'
                map.connect 'projects/:project_id/boards/:action/:id', :controller => 'boards'
                map.connect 'boards/:board_id/topics/:action/:id', :controller => 'messages'
                map.connect 'wiki/:id/:page/:action', :page => nil, :controller => 'wiki'
                map.connect 'issues/:issue_id/relations/:action/:id', :controller => 'issue_relations'
                map.connect 'projects/:project_id/news/:action', :controller => 'news'
                map.connect 'projects/:project_id/timelog/:action/:id', :controller => 'timelog', :project_id => /.+/
                map.with_options :controller => 'repositories' do |omap|
                  omap.repositories_show 'repositories/browse/:id/*path', :action => 'browse'
                  omap.repositories_changes 'repositories/changes/:id/*path', :action => 'changes'
                  omap.repositories_diff 'repositories/diff/:id/*path', :action => 'diff'
                  omap.repositories_entry 'repositories/entry/:id/*path', :action => 'entry'
                  omap.repositories_entry 'repositories/annotate/:id/*path', :action => 'annotate'
                  omap.connect 'repositories/revision/:id/:rev', :action => 'revision'
                end
                map.with_options :controller => 'sys' do |sys|
                  sys.connect 'sys/projects.:format', :action => 'projects', :conditions => {:method => :get}
                  sys.connect 'sys/projects/:id/repository.:format', :action => 'create_project_repository', :conditions => {:method => :post}
                end
                # Install the default route as the lowest priority.
                map.connect ':controller/:action/:id'
                map.connect 'robots.txt', :controller => 'welcome', :action => 'robots'
                # Used for OpenID
                map.root :controller => 'account', :action => 'login'
              end

lib/redmine.rb +1 -1

              require 'redmine/access_control'
              require 'redmine/menu_manager'
              require 'redmine/activity'
              require 'redmine/mime_type'
              require 'redmine/core_ext'
              require 'redmine/themes'
              require 'redmine/hook'
              require 'redmine/plugin'
              require 'redmine/wiki_formatting'
              begin
                require_library_or_gem 'RMagick' unless Object.const_defined?(:Magick)
              rescue LoadError
                # RMagick is not available
              end
              REDMINE_SUPPORTED_SCM = %w( Subversion Darcs Mercurial Cvs Bazaar Git Filesystem )
              # Permissions
              Redmine::AccessControl.map do |map|
                map.permission :view_project, {:projects => [:show, :activity]}, :public => true
                map.permission :search_project, {:search => :index}, :public => true
                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|
                  # Issue categories
                  map.permission :manage_categories, {:projects => [:settings, :add_issue_category], :issue_categories => [:edit, :destroy]}, :require => :member
                  # Issues
                  map.permission :view_issues, {:projects => [:changelog, :roadmap],
                                                :issues => [:index, :changes, :show, :context_menu],
                                                :versions => [:show, :status_by],
                                                :queries => :index,
                                                :reports => :issue_report}, :public => true
                  map.permission :add_issues, {:issues => :new}
                  map.permission :edit_issues, {:issues => [:edit, :reply, :bulk_edit]}
                  map.permission :manage_issue_relations, {:issue_relations => [:new, :destroy]}
                  map.permission :add_issue_notes, {:issues => [:edit, :reply]}
                  map.permission :edit_issue_notes, {:journals => :edit}, :require => :loggedin
                  map.permission :edit_own_issue_notes, {:journals => :edit}, :require => :loggedin
                  map.permission :move_issues, {:issues => :move}, :require => :loggedin
                  map.permission :delete_issues, {:issues => :destroy}, :require => :member
                  # Queries
                  map.permission :manage_public_queries, {:queries => [:new, :edit, :destroy]}, :require => :member
                  map.permission :save_queries, {:queries => [:new, :edit, :destroy]}, :require => :loggedin
                  # Gantt & calendar
                  map.permission :view_gantt, :issues => :gantt
                  map.permission :view_calendar, :issues => :calendar
                  # Watchers
                  map.permission :view_issue_watchers, {}
                  map.permission :add_issue_watchers, {:watchers => :new}
                end
                map.project_module :time_tracking do |map|
                  map.permission :log_time, {:timelog => :edit}, :require => :loggedin
                  map.permission :view_time_entries, :timelog => [:details, :report]
                  map.permission :edit_time_entries, {:timelog => [:edit, :destroy]}, :require => :member
                  map.permission :edit_own_time_entries, {:timelog => [:edit, :destroy]}, :require => :loggedin
                end
                map.project_module :news do |map|
                  map.permission :manage_news, {:news => [:new, :edit, :destroy, :destroy_comment]}, :require => :member
                  map.permission :view_news, {:news => [:index, :show]}, :public => true
                  map.permission :comment_news, {:news => :add_comment}
                end
                map.project_module :documents do |map|
                  map.permission :manage_documents, {:documents => [:new, :edit, :destroy, :add_attachment]}, :require => :loggedin
                  map.permission :view_documents, :documents => [:index, :show, :download]
                end
                map.project_module :files do |map|
                  map.permission :manage_files, {:projects => :add_file}, :require => :loggedin
                  map.permission :view_files, :projects => :list_files, :versions => :download
                end
                map.project_module :wiki do |map|
                  map.permission :manage_wiki, {:wikis => [:edit, :destroy]}, :require => :member
                  map.permission :rename_wiki_pages, {:wiki => :rename}, :require => :member
                  map.permission :delete_wiki_pages, {:wiki => :destroy}, :require => :member
                  map.permission :view_wiki_pages, :wiki => [:index, :special]
                  map.permission :view_wiki_edits, :wiki => [:history, :diff, :annotate]
                  map.permission :edit_wiki_pages, :wiki => [:edit, :preview, :add_attachment]
                  map.permission :delete_wiki_pages_attachments, {}
                  map.permission :protect_wiki_pages, {:wiki => :protect}, :require => :member
                end
                map.project_module :repository do |map|
                  map.permission :manage_repository, {:repositories => [:edit, :committers, :destroy]}, :require => :member
                  map.permission :browse_repository, :repositories => [:show, :browse, :entry, :annotate, :changes, :diff, :stats, :graph]
                  map.permission :view_changesets, :repositories => [:show, :revisions, :revision]
                  map.permission :commit_access, {}
                end
                map.project_module :boards do |map|
                  map.permission :manage_boards, {:boards => [:new, :edit, :destroy]}, :require => :member
                  map.permission :view_messages, {:boards => [:index, :show], :messages => [:show]}, :public => true
                  map.permission :add_messages, {:messages => [:new, :reply, :quote]}
                  map.permission :edit_messages, {:messages => :edit}, :require => :member
                  map.permission :edit_own_messages, {:messages => :edit}, :require => :loggedin
                  map.permission :delete_messages, {:messages => :destroy}, :require => :member
                  map.permission :delete_own_messages, {:messages => :destroy}, :require => :loggedin
                end
              end
              Redmine::MenuManager.map :top_menu do |menu|
                menu.push :home, :home_path
                menu.push :my_page, { :controller => 'my', :action => 'page' }, :if => Proc.new { User.current.logged? }
                menu.push :projects, { :controller => 'projects', :action => 'index' }, :caption => :label_project_plural
                menu.push :administration, { :controller => 'admin', :action => 'index' }, :if => Proc.new { User.current.admin? }, :last => true
                menu.push :help, Redmine::Info.help_url, :last => true
              end
              Redmine::MenuManager.map :account_menu do |menu|
                menu.push :login, :signin_path, :if => Proc.new { !User.current.logged? }
                menu.push :register, { :controller => 'account', :action => 'register' }, :if => Proc.new { !User.current.logged? && Setting.self_registration? }
                menu.push :my_account, { :controller => 'my', :action => 'account' }, :if => Proc.new { User.current.logged? }
                menu.push :logout, :signout_path, :if => Proc.new { User.current.logged? }
              end
              Redmine::MenuManager.map :application_menu do |menu|
                # Empty
              end
              Redmine::MenuManager.map :admin_menu do |menu|
                # Empty
              end
              Redmine::MenuManager.map :project_menu do |menu|
                menu.push :overview, { :controller => 'projects', :action => 'show' }
                menu.push :activity, { :controller => 'projects', :action => 'activity' }
                menu.push :roadmap, { :controller => 'projects', :action => 'roadmap' },
                            :if => Proc.new { |p| p.versions.any? }
                menu.push :issues, { :controller => 'issues', :action => 'index' }, :param => :project_id, :caption => :label_issue_plural
                menu.push :new_issue, { :controller => 'issues', :action => 'new' }, :param => :project_id, :caption => :label_issue_new,
                            :html => { :accesskey => Redmine::AccessKeys.key_for(:new_issue) }
                menu.push :news, { :controller => 'news', :action => 'index' }, :param => :project_id, :caption => :label_news_plural
                menu.push :documents, { :controller => 'documents', :action => 'index' }, :param => :project_id, :caption => :label_document_plural
                menu.push :wiki, { :controller => 'wiki', :action => 'index', :page => nil },
                            :if => Proc.new { |p| p.wiki && !p.wiki.new_record? }
                menu.push :boards, { :controller => 'boards', :action => 'index', :id => nil }, :param => :project_id,
                            :if => Proc.new { |p| p.boards.any? }, :caption => :label_board_plural
                menu.push :files, { :controller => 'projects', :action => 'list_files' }, :caption => :label_attachment_plural
                menu.push :repository, { :controller => 'repositories', :action => 'show' },
                            :if => Proc.new { |p| p.repository && !p.repository.new_record? }
                menu.push :settings, { :controller => 'projects', :action => 'settings' }, :last => true
              end
              Redmine::Activity.map do |activity|
                activity.register :issues, :class_name => %w(Issue Journal)
                activity.register :changesets
                activity.register :news
                activity.register :documents, :class_name => %w(Document Attachment)
                activity.register :files, :class_name => 'Attachment'
                activity.register :wiki_edits, :class_name => 'WikiContent::Version', :default => false
                activity.register :messages, :default => false
              end
              Redmine::WikiFormatting.map do |format|
                format.register :textile, Redmine::WikiFormatting::Textile::Formatter, Redmine::WikiFormatting::Textile::Helper
              end

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

NO CONTENT: modified file, binary diff hidden

public/stylesheets/application.css +9 -6

              body { font-family: Verdana, sans-serif; font-size: 12px; color:#484848; margin: 0; padding: 0; min-width: 900px; }
              h1, h2, h3, h4 { font-family: "Trebuchet MS", Verdana, sans-serif;}
              h1 {margin:0; padding:0; font-size: 24px;}
              h2, .wiki h1 {font-size: 20px;padding: 2px 10px 1px 0px;margin: 0 0 10px 0; border-bottom: 1px solid #bbbbbb; color: #444;}
              h3, .wiki h2 {font-size: 16px;padding: 2px 10px 1px 0px;margin: 0 0 10px 0; border-bottom: 1px solid #bbbbbb; color: #444;}
              h4, .wiki h3 {font-size: 13px;padding: 2px 10px 1px 0px;margin-bottom: 5px; border-bottom: 1px dotted #bbbbbb; color: #444;}
              /***** Layout *****/
              #wrapper {background: white;}
              #top-menu {background: #2C4056; color: #fff; height:1.8em; font-size: 0.8em; padding: 2px 2px 0px 6px;}
              #top-menu ul {margin: 0;  padding: 0;}
              #top-menu li {
                float:left;
                list-style-type:none;
                margin: 0px 0px 0px 0px;
                padding: 0px 0px 0px 0px;
                white-space:nowrap;
              }
              #top-menu a {color: #fff; margin-right: 8px; font-weight: bold;}
              #top-menu #loggedas { float: right; margin-right: 0.5em; color: #fff; }
              #account {float:right;}
              #header {height:5.3em;margin:0;background-color:#507AAA;color:#f8f8f8; padding: 4px 8px 0px 6px; position:relative;}
              #header a {color:#f8f8f8;}
              #header h1 a.ancestor { font-size: 80%; }
              #quick-search {float:right;}
              #main-menu {position: absolute;  bottom: 0px;  left:6px; margin-right: -500px;}
              #main-menu ul {margin: 0;  padding: 0;}
              #main-menu li {
                float:left;
                list-style-type:none;
                margin: 0px 2px 0px 0px;
                padding: 0px 0px 0px 0px;
                white-space:nowrap;
              }
              #main-menu li a {
                display: block;
                color: #fff;
                text-decoration: none;
                font-weight: bold;
                margin: 0;
                padding: 4px 10px 4px 10px;
              }
              #main-menu li a:hover {background:#759FCF; color:#fff;}
              #main-menu li a.selected, #main-menu li a.selected:hover {background:#fff; color:#555;}
              #main {background-color:#EEEEEE;}
              #sidebar{ float: right; width: 17%; position: relative; z-index: 9; min-height: 600px; padding: 0; margin: 0;}
              * html #sidebar{ width: 17%; }
              #sidebar h3{ font-size: 14px; margin-top:14px; color: #666;  }
              #sidebar hr{ width: 100%; margin: 0 auto; height: 1px; background: #ccc; border: 0; }
              * html #sidebar hr{ width: 95%; position: relative; left: -6px; color: #ccc; }
              #content { width: 80%; background-color: #fff; margin: 0px; border-right: 1px solid #ddd; padding: 6px 10px 10px 10px; z-index: 10; }
              * html #content{ width: 80%; padding-left: 0; margin-top: 0px; padding: 6px 10px 10px 10px;}
              html>body #content { min-height: 600px; }
              * html body #content { height: 600px; } /* IE */
              #main.nosidebar #sidebar{ display: none; }
              #main.nosidebar #content{ width: auto; border-right: 0; }
              #footer {clear: both; border-top: 1px solid #bbb; font-size: 0.9em; color: #aaa; padding: 5px; text-align:center; background:#fff;}
              #login-form table {margin-top:5em; padding:1em; margin-left: auto; margin-right: auto; border: 2px solid #FDBF3B; background-color:#FFEBC1; }
              #login-form table td {padding: 6px;}
              #login-form label {font-weight: bold;}
              #login-form input#username, #login-form input#password { width: 300px; }
              input#openid_url { background: url(../images/openid-bg.gif) no-repeat; background-color: #fff; background-position: 0 50%; padding-left: 18px; }
              .clear:after{ content: "."; display: block; height: 0; clear: both; visibility: hidden; }
              /***** Links *****/
              a, a:link, a:visited{ color: #2A5685; text-decoration: none; }
              a:hover, a:active{ color: #c61a1a; text-decoration: underline;}
              a img{ border: 0; }
              a.issue.closed, a.issue.closed:link, a.issue.closed:visited { color: #999; text-decoration: line-through; }
              /***** Tables *****/
              table.list { border: 1px solid #e4e4e4;  border-collapse: collapse; width: 100%; margin-bottom: 4px; }
              table.list th {  background-color:#EEEEEE; padding: 4px; white-space:nowrap; }
              table.list td { vertical-align: top; }
              table.list td.id { width: 2%; text-align: center;}
              table.list td.checkbox { width: 15px; padding: 0px;}
              table.list td.buttons { width: 15%; white-space:nowrap; text-align: right; }
              table.list td.buttons a { padding-right: 0.6em; }
              tr.project td.name a { padding-left: 16px; white-space:nowrap; }
              tr.project.parent td.name a { background: url('../images/bullet_toggle_minus.png') no-repeat; }
              tr.issue { text-align: center; white-space: nowrap; }
              tr.issue td.subject, tr.issue td.category, td.assigned_to { white-space: normal; }
              tr.issue td.subject { text-align: left; }
              tr.issue td.done_ratio table.progress { margin-left:auto; margin-right: auto;}
              tr.entry { border: 1px solid #f8f8f8; }
              tr.entry td { white-space: nowrap; }
              tr.entry td.filename { width: 30%; }
              tr.entry td.size { text-align: right; font-size: 90%; }
              tr.entry td.revision, tr.entry td.author { text-align: center; }
              tr.entry td.age { text-align: right; }
              tr.entry.file td.filename a { margin-left: 16px; }
              tr span.expander {background-image: url(../images/bullet_toggle_plus.png); padding-left: 8px; margin-left: 0; cursor: pointer;}
              tr.open span.expander {background-image: url(../images/bullet_toggle_minus.png);}
              tr.changeset td.author { text-align: center; width: 15%; }
              tr.changeset td.committed_on { text-align: center; width: 15%; }
              table.files tr.file td { text-align: center; }
              table.files tr.file td.filename { text-align: left; padding-left: 24px; }
              table.files tr.file td.digest { font-size: 80%; }
              table.members td.roles, table.memberships td.roles { width: 45%; }
              tr.message { height: 2.6em; }
              tr.message td.last_message { font-size: 80%; }
              tr.message.locked td.subject a { background-image: url(../images/locked.png); }
              tr.message.sticky td.subject a { background-image: url(../images/sticky.png); font-weight: bold; }
              tr.user td { width:13%; }
              tr.user td.email { width:18%; }
              tr.user td { white-space: nowrap; }
              tr.user.locked, tr.user.registered { color: #aaa; }
              tr.user.locked a, tr.user.registered a { color: #aaa; }
              tr.time-entry { text-align: center; white-space: nowrap; }
              tr.time-entry td.subject, tr.time-entry td.comments { text-align: left; white-space: normal; }
              td.hours { text-align: right; font-weight: bold; padding-right: 0.5em; }
              td.hours .hours-dec { font-size: 0.9em; }
              table.plugins td { vertical-align: middle; }
              table.plugins td.configure { text-align: right; padding-right: 1em; }
              table.plugins span.name { font-weight: bold; display: block; margin-bottom: 6px; }
              table.plugins span.description { display: block; font-size: 0.9em; }
              table.plugins span.url { display: block; font-size: 0.9em; }
              table.list tbody tr.group td { padding: 0.8em 0 0.5em 0.3em; font-weight: bold; border-bottom: 1px solid #ccc; }
              table.list tbody tr.group span.count { color: #aaa; font-size: 80%; }
              table.list tbody tr:hover { background-color:#ffffdd; }
              table.list tbody tr.group:hover { background-color:inherit; }
              table td {padding:2px;}
              table p {margin:0;}
              .odd {background-color:#f6f7f8;}
              .even {background-color: #fff;}
              a.sort { padding-right: 16px; background-position: 100% 50%; background-repeat: no-repeat; }
              a.sort.asc  { background-image: url(../images/sort_asc.png); }
              a.sort.desc { background-image: url(../images/sort_desc.png); }
              table.attributes { width: 100% }
              table.attributes th { vertical-align: top; text-align: left; }
              table.attributes td { vertical-align: top; }
              .highlight { background-color: #FCFD8D;}
              .highlight.token-1 { background-color: #faa;}
              .highlight.token-2 { background-color: #afa;}
              .highlight.token-3 { background-color: #aaf;}
              .box{
              padding:6px;
              margin-bottom: 10px;
              background-color:#f6f6f6;
              color:#505050;
              line-height:1.5em;
              border: 1px solid #e4e4e4;
              }
              div.square {
               border: 1px solid #999;
               float: left;
               margin: .3em .4em 0 .4em;
               overflow: hidden;
               width: .6em; height: .6em;
              }
              .contextual {float:right; white-space: nowrap; line-height:1.4em;margin-top:5px; padding-left: 10px; font-size:0.9em;}
              .contextual input, .contextual select {font-size:0.9em;}
              .message .contextual { margin-top: 0; }
              .splitcontentleft{float:left; width:49%;}
              .splitcontentright{float:right; width:49%;}
              form {display: inline;}
              input, select {vertical-align: middle; margin-top: 1px; margin-bottom: 1px;}
              fieldset {border: 1px solid #e4e4e4; margin:0;}
              legend {color: #484848;}
              hr { width: 100%; height: 1px; background: #ccc; border: 0;}
              blockquote { font-style: italic; border-left: 3px solid #e0e0e0; padding-left: 0.6em; margin-left: 2.4em;}
              blockquote blockquote { margin-left: 0;}
              textarea.wiki-edit { width: 99%; }
              li p {margin-top: 0;}
              div.issue {background:#ffffdd; padding:6px; margin-bottom:6px;border: 1px solid #d7d7d7;}
              p.breadcrumb { font-size: 0.9em; margin: 4px 0 4px 0;}
              p.subtitle { font-size: 0.9em; margin: -6px 0 12px 0; font-style: italic; }
              p.footnote { font-size: 0.9em; margin-top: 0px; margin-bottom: 0px; }
              #query_form_content { font-size: 0.9em; padding: 4px; background: #f6f6f6; border: 1px solid #e4e4e4; }
              #query_form_content fieldset#filters { border-left: 0; border-right: 0; }
              #query_form_content p { margin-top: 0.5em; margin-bottom: 0.5em; }
              fieldset#filters, fieldset#date-range { padding: 0.7em; margin-bottom: 8px; }
              fieldset#filters p { margin: 1.2em 0 0.8em 2px; }
              fieldset#filters table { border-collapse: collapse; }
              fieldset#filters table td { padding: 0; vertical-align: middle; }
              fieldset#filters tr.filter { height: 2em; }
              fieldset#filters td.add-filter { text-align: right; vertical-align: top; }
              .buttons { font-size: 0.9em; margin-bottom: 1.4em; }
              div#issue-changesets {float:right; width:45%; margin-left: 1em; margin-bottom: 1em; background: #fff; padding-left: 1em; font-size: 90%;}
              div#issue-changesets .changeset { padding: 4px;}
              div#issue-changesets .changeset { border-bottom: 1px solid #ddd; }
              div#issue-changesets p { margin-top: 0; margin-bottom: 1em;}
              div#activity dl, #search-results { margin-left: 2em; }
              div#activity dd, #search-results dd { margin-bottom: 1em; padding-left: 18px; font-size: 0.9em; }
              div#activity dt, #search-results dt { margin-bottom: 0px; padding-left: 20px; line-height: 18px; background-position: 0 50%; background-repeat: no-repeat; }
              div#activity dt.me .time { border-bottom: 1px solid #999; }
              div#activity dt .time { color: #777; font-size: 80%; }
              div#activity dd .description, #search-results dd .description { font-style: italic; }
              div#activity span.project:after, #search-results span.project:after { content: " -"; }
              div#activity dd span.description, #search-results dd span.description { display:block; color: #808080; }
              #search-results dd { margin-bottom: 1em; padding-left: 20px; margin-left:0px; }
              div#search-results-counts {float:right;}
              div#search-results-counts ul { margin-top: 0.5em; }
              div#search-results-counts  li { list-style-type:none; float: left; margin-left: 1em; }
              dt.issue { background-image: url(../images/ticket.png); }
              dt.issue-edit { background-image: url(../images/ticket_edit.png); }
              dt.issue-closed { background-image: url(../images/ticket_checked.png); }
              dt.issue-note { background-image: url(../images/ticket_note.png); }
              dt.changeset { background-image: url(../images/changeset.png); }
              dt.news { background-image: url(../images/news.png); }
              dt.message { background-image: url(../images/message.png); }
              dt.reply { background-image: url(../images/comments.png); }
              dt.wiki-page { background-image: url(../images/wiki_edit.png); }
              dt.attachment { background-image: url(../images/attachment.png); }
              dt.document { background-image: url(../images/document.png); }
              dt.project { background-image: url(../images/projects.png); }
              #search-results dt.issue.closed { background-image: url(../images/ticket_checked.png); }
              div#roadmap fieldset.related-issues { margin-bottom: 1em; }
              div#roadmap fieldset.related-issues ul { margin-top: 0.3em; margin-bottom: 0.3em; }
              div#roadmap .wiki h1:first-child { display: none; }
              div#roadmap .wiki h1 { font-size: 120%; }
              div#roadmap .wiki h2 { font-size: 110%; }
              div#version-summary { float:right; width:380px; margin-left: 16px; margin-bottom: 16px; background-color: #fff; }
              div#version-summary fieldset { margin-bottom: 1em; }
              div#version-summary .total-hours { text-align: right; }
              table#time-report td.hours, table#time-report th.period, table#time-report th.total { text-align: right; padding-right: 0.5em; }
              table#time-report tbody tr { font-style: italic; color: #777; }
              table#time-report tbody tr.last-level { font-style: normal; color: #555; }
              table#time-report tbody tr.total { font-style: normal; font-weight: bold; color: #555; background-color:#EEEEEE; }
              table#time-report .hours-dec { font-size: 0.9em; }
              form#issue-form .attributes { margin-bottom: 8px; }
              form#issue-form .attributes p { padding-top: 1px; padding-bottom: 2px; }
              form#issue-form .attributes select { min-width: 30%; }
              ul.projects { margin: 0; padding-left: 1em; }
              ul.projects.root { margin: 0;  padding: 0; }
              ul.projects ul { border-left: 3px solid #e0e0e0; }
              ul.projects li { list-style-type:none; }
              ul.projects li.root { margin-bottom: 1em; }
              ul.projects li.child { margin-top: 1em;}
              ul.projects div.root a.project { font-family: "Trebuchet MS", Verdana, sans-serif; font-weight: bold; font-size: 16px; margin: 0 0 10px 0; }
              .my-project { padding-left: 18px; background: url(../images/fav.png) no-repeat 0 50%; }
              #tracker_project_ids ul { margin: 0;  padding-left: 1em; }
              #tracker_project_ids li { list-style-type:none; }
              ul.properties {padding:0; font-size: 0.9em; color: #777;}
              ul.properties li {list-style-type:none;}
              ul.properties li span {font-style:italic;}
              .total-hours { font-size: 110%; font-weight: bold; }
              .total-hours span.hours-int { font-size: 120%; }
              .autoscroll {overflow-x: auto; padding:1px; margin-bottom: 1.2em;}
              #user_firstname, #user_lastname, #user_mail, #my_account_form select { width: 90%; }
              .pagination {font-size: 90%}
              p.pagination {margin-top:8px;}
              /***** Tabular forms ******/
              .tabular p{
              margin: 0;
              padding: 5px 0 8px 0;
              padding-left: 180px; /*width of left column containing the label elements*/
              height: 1%;
              clear:left;
              }
              html>body .tabular p {overflow:hidden;}
              .tabular label{
              font-weight: bold;
              float: left;
              text-align: right;
              margin-left: -180px; /*width of left column*/
              width: 175px; /*width of labels. Should be smaller than left column to create some right
              margin*/
              }
              .tabular label.floating{
              font-weight: normal;
              margin-left: 0px;
              text-align: left;
              width: 270px;
              }
              input#time_entry_comments { width: 90%;}
              #preview fieldset {margin-top: 1em; background: url(../images/draft.png)}
              .tabular.settings p{ padding-left: 300px; }
              .tabular.settings label{ margin-left: -300px; width: 295px; }
              .required {color: #bb0000;}
              .summary {font-style: italic;}
              #attachments_fields input[type=text] {margin-left: 8px; }
              div.attachments { margin-top: 12px; }
              div.attachments p { margin:4px 0 2px 0; }
              div.attachments img { vertical-align: middle; }
              div.attachments span.author { font-size: 0.9em; color: #888; }
              p.other-formats { text-align: right; font-size:0.9em; color: #666; }
              .other-formats span + span:before { content: "| "; }
              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 .splitcontentright, div#tab-content-memberships .splitcontentright { width: 34% }
-             div#tab-content-members fieldset, div#tab-content-memberships 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 label, div#tab-content-memberships fieldset label { display: block; }
-             div#tab-content-members fieldset div { max-height: 400px; overflow:auto; }
+             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, div#tab-content-users .splitcontentright { width: 34% }
+             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, div#tab-content-users fieldset legend { font-weight: bold; }
+             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, 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; }
              /***** Flash & error messages ****/
              #errorExplanation, div.flash, .nodata, .warning {
                  padding: 4px 4px 4px 30px;
                  margin-bottom: 12px;
              	font-size: 1.1em;
              	border: 2px solid;
              }
              div.flash {margin-top: 8px;}
              div.flash.error, #errorExplanation {
                  background: url(../images/false.png) 8px 5px no-repeat;
              	background-color: #ffe3e3;
              	border-color: #dd0000;
              	color: #550000;
              }
              div.flash.notice {
                  background: url(../images/true.png) 8px 5px no-repeat;
              	background-color: #dfffdf;
              	border-color: #9fcf9f;
              	color: #005f00;
              }
              div.flash.warning {
                background: url(../images/warning.png) 8px 5px no-repeat;
              	background-color: #FFEBC1;
              	border-color: #FDBF3B;
              	color: #A6750C;
                text-align: left;
              }
              .nodata, .warning {
                  text-align: center;
              	background-color: #FFEBC1;
              	border-color: #FDBF3B;
              	color: #A6750C;
              }
              #errorExplanation ul { font-size: 0.9em;}
              #errorExplanation h2, #errorExplanation p { display: none; }
              /***** Ajax indicator ******/
              #ajax-indicator {
              position: absolute; /* fixed not supported by IE */
              background-color:#eee;
              border: 1px solid #bbb;
              top:35%;
              left:40%;
              width:20%;
              font-weight:bold;
              text-align:center;
              padding:0.6em;
              z-index:100;
              filter:alpha(opacity=50);
              opacity: 0.5;
              }
              html>body #ajax-indicator { position: fixed; }
              #ajax-indicator span {
              background-position: 0% 40%;
              background-repeat: no-repeat;
              background-image: url(../images/loading.gif);
              padding-left: 26px;
              vertical-align: bottom;
              }
              /***** Calendar *****/
              table.cal {border-collapse: collapse; width: 100%; margin: 0px 0 6px 0;border: 1px solid #d7d7d7;}
              table.cal thead th {width: 14%;}
              table.cal tbody tr {height: 100px;}
              table.cal th { background-color:#EEEEEE; padding: 4px; }
              table.cal td {border: 1px solid #d7d7d7; vertical-align: top; font-size: 0.9em;}
              table.cal td p.day-num {font-size: 1.1em; text-align:right;}
              table.cal td.odd p.day-num {color: #bbb;}
              table.cal td.today {background:#ffffdd;}
              table.cal td.today p.day-num {font-weight: bold;}
              /***** Tooltips ******/
              .tooltip{position:relative;z-index:24;}
              .tooltip:hover{z-index:25;color:#000;}
              .tooltip span.tip{display: none; text-align:left;}
              div.tooltip:hover span.tip{
              display:block;
              position:absolute;
              top:12px; left:24px; width:270px;
              border:1px solid #555;
              background-color:#fff;
              padding: 4px;
              font-size: 0.8em;
              color:#505050;
              }
              /***** Progress bar *****/
              table.progress {
                  border: 1px solid #D7D7D7;
                  border-collapse: collapse;
                  border-spacing: 0pt;
                  empty-cells: show;
                  text-align: center;
                  float:left;
                  margin: 1px 6px 1px 0px;
              }
              table.progress td { height: 0.9em; }
              table.progress td.closed { background: #BAE0BA none repeat scroll 0%; }
              table.progress td.done { background: #DEF0DE none repeat scroll 0%; }
              table.progress td.open { background: #FFF none repeat scroll 0%; }
              p.pourcent {font-size: 80%;}
              p.progress-info {clear: left; font-style: italic; font-size: 80%;}
              /***** Tabs *****/
              #content .tabs {height: 2.6em; border-bottom: 1px solid #bbbbbb; margin-bottom:1.2em; position:relative;}
              #content .tabs ul {margin:0; position:absolute; bottom:-2px; padding-left:1em;}
              #content .tabs>ul { bottom:-1px; } /* others */
              #content .tabs ul li {
              float:left;
              list-style-type:none;
              white-space:nowrap;
              margin-right:8px;
              background:#fff;
              }
              #content .tabs ul li a{
              display:block;
              font-size: 0.9em;
              text-decoration:none;
              line-height:1.3em;
              padding:4px 6px 4px 6px;
              border: 1px solid #ccc;
              border-bottom: 1px solid #bbbbbb;
              background-color: #eeeeee;
              color:#777;
              font-weight:bold;
              }
              #content .tabs ul li a:hover {
              background-color: #ffffdd;
              text-decoration:none;
              }
              #content .tabs ul li a.selected {
              background-color: #fff;
              border: 1px solid #bbbbbb;
              border-bottom: 1px solid #fff;
              }
              #content .tabs ul li a.selected:hover {
              background-color: #fff;
              }
              /***** Auto-complete *****/
              div.autocomplete {
                position:absolute;
                width:250px;
                background-color:white;
                margin:0;
                padding:0;
              }
              div.autocomplete ul {
                list-style-type:none;
                margin:0;
                padding:0;
              }
              div.autocomplete ul li.selected { background-color: #ffb;}
              div.autocomplete ul li {
                list-style-type:none;
                display:block;
                margin:0;
                padding:2px;
                cursor:pointer;
                font-size: 90%;
                border-bottom: 1px solid #ccc;
                border-left: 1px solid #ccc;
                border-right: 1px solid #ccc;
              }
              div.autocomplete ul li span.informal {
                font-size: 80%;
                color: #aaa;
              }
              /***** Diff *****/
              .diff_out { background: #fcc; }
              .diff_in { background: #cfc; }
              /***** Wiki *****/
              div.wiki table {
                  border: 1px solid #505050;
                  border-collapse: collapse;
                  margin-bottom: 1em;
              }
              div.wiki table, div.wiki td, div.wiki th {
                  border: 1px solid #bbb;
                  padding: 4px;
              }
              div.wiki .external {
                  background-position: 0% 60%;
                  background-repeat: no-repeat;
                  padding-left: 12px;
                  background-image: url(../images/external.png);
              }
              div.wiki a.new {
                  color: #b73535;
              }
              div.wiki pre {
                  margin: 1em 1em 1em 1.6em;
                  padding: 2px;
                  background-color: #fafafa;
                  border: 1px solid #dadada;
                  width:95%;
                  overflow-x: auto;
              }
              div.wiki ul.toc {
                  background-color: #ffffdd;
                  border: 1px solid #e4e4e4;
                  padding: 4px;
                  line-height: 1.2em;
                  margin-bottom: 12px;
                  margin-right: 12px;
                  margin-left: 0;
                  display: table
              }
              * html div.wiki ul.toc { width: 50%; } /* IE6 doesn't autosize div */
              div.wiki ul.toc.right { float: right; margin-left: 12px; margin-right: 0; width: auto; }
              div.wiki ul.toc.left  { float: left; margin-right: 12px; margin-left: 0; width: auto; }
              div.wiki ul.toc li { list-style-type:none;}
              div.wiki ul.toc li.heading2 { margin-left: 6px; }
              div.wiki ul.toc li.heading3 { margin-left: 12px; font-size: 0.8em; }
              div.wiki ul.toc a {
                  font-size: 0.9em;
                  font-weight: normal;
                  text-decoration: none;
                  color: #606060;
              }
              div.wiki ul.toc a:hover { color: #c61a1a; text-decoration: underline;}
              a.wiki-anchor { display: none; margin-left: 6px; text-decoration: none; }
              a.wiki-anchor:hover { color: #aaa !important; text-decoration: none; }
              h1:hover a.wiki-anchor, h2:hover a.wiki-anchor, h3:hover a.wiki-anchor { display: inline; color: #ddd; }
              /***** My page layout *****/
              .block-receiver {
              border:1px dashed #c0c0c0;
              margin-bottom: 20px;
              padding: 15px 0 15px 0;
              }
              .mypage-box {
              margin:0 0 20px 0;
              color:#505050;
              line-height:1.5em;
              }
              .handle {
              cursor: move;
              }
              a.close-icon {
              display:block;
              margin-top:3px;
              overflow:hidden;
              width:12px;
              height:12px;
              background-repeat: no-repeat;
              cursor:pointer;
              background-image:url('../images/close.png');
              }
              a.close-icon:hover {
              background-image:url('../images/close_hl.png');
              }
              /***** Gantt chart *****/
              .gantt_hdr {
                position:absolute;
                top:0;
                height:16px;
                border-top: 1px solid #c0c0c0;
                border-bottom: 1px solid #c0c0c0;
                border-right: 1px solid #c0c0c0;
                text-align: center;
                overflow: hidden;
              }
              .task {
                position: absolute;
                height:8px;
                font-size:0.8em;
                color:#888;
                padding:0;
                margin:0;
                line-height:0.8em;
              }
              .task_late { background:#f66 url(../images/task_late.png); border: 1px solid #f66; }
              .task_done { background:#66f url(../images/task_done.png); border: 1px solid #66f; }
              .task_todo { background:#aaa url(../images/task_todo.png); border: 1px solid #aaa; }
              .milestone { background-image:url(../images/milestone.png); background-repeat: no-repeat; border: 0; }
              /***** Icons *****/
              .icon {
              background-position: 0% 40%;
              background-repeat: no-repeat;
              padding-left: 20px;
              padding-top: 2px;
              padding-bottom: 3px;
              }
              .icon22 {
              background-position: 0% 40%;
              background-repeat: no-repeat;
              padding-left: 26px;
              line-height: 22px;
              vertical-align: middle;
              }
              .icon-add { background-image: url(../images/add.png); }
              .icon-edit { background-image: url(../images/edit.png); }
              .icon-copy { background-image: url(../images/copy.png); }
              .icon-del { background-image: url(../images/delete.png); }
              .icon-move { background-image: url(../images/move.png); }
              .icon-save { background-image: url(../images/save.png); }
              .icon-cancel { background-image: url(../images/cancel.png); }
              .icon-folder { background-image: url(../images/folder.png); }
              .open .icon-folder { background-image: url(../images/folder_open.png); }
              .icon-package { background-image: url(../images/package.png); }
              .icon-home { background-image: url(../images/home.png); }
              .icon-user { background-image: url(../images/user.png); }
              .icon-mypage { background-image: url(../images/user_page.png); }
              .icon-admin { background-image: url(../images/admin.png); }
              .icon-projects { background-image: url(../images/projects.png); }
              .icon-help { background-image: url(../images/help.png); }
              .icon-attachment  { background-image: url(../images/attachment.png); }
              .icon-index  { background-image: url(../images/index.png); }
              .icon-history  { background-image: url(../images/history.png); }
              .icon-time  { background-image: url(../images/time.png); }
              .icon-time-add  { background-image: url(../images/time_add.png); }
              .icon-stats  { background-image: url(../images/stats.png); }
              .icon-warning  { background-image: url(../images/warning.png); }
              .icon-fav  { background-image: url(../images/fav.png); }
              .icon-fav-off  { background-image: url(../images/fav_off.png); }
              .icon-reload  { background-image: url(../images/reload.png); }
              .icon-lock  { background-image: url(../images/locked.png); }
              .icon-unlock  { background-image: url(../images/unlock.png); }
              .icon-checked  { background-image: url(../images/true.png); }
              .icon-details  { background-image: url(../images/zoom_in.png); }
              .icon-report  { background-image: url(../images/report.png); }
              .icon-comment  { background-image: url(../images/comment.png); }
              .icon-file { background-image: url(../images/files/default.png); }
              .icon-file.text-plain { background-image: url(../images/files/text.png); }
              .icon-file.text-x-c { background-image: url(../images/files/c.png); }
              .icon-file.text-x-csharp { background-image: url(../images/files/csharp.png); }
              .icon-file.text-x-php { background-image: url(../images/files/php.png); }
              .icon-file.text-x-ruby { background-image: url(../images/files/ruby.png); }
              .icon-file.text-xml { background-image: url(../images/files/xml.png); }
              .icon-file.image-gif { background-image: url(../images/files/image.png); }
              .icon-file.image-jpeg { background-image: url(../images/files/image.png); }
              .icon-file.image-png { background-image: url(../images/files/image.png); }
              .icon-file.image-tiff { background-image: url(../images/files/image.png); }
              .icon-file.application-pdf { background-image: url(../images/files/pdf.png); }
              .icon-file.application-zip { background-image: url(../images/files/zip.png); }
              .icon-file.application-x-gzip { background-image: url(../images/files/zip.png); }
              .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); }
              .icon22-options { background-image: url(../images/22x22/options.png); }
              .icon22-notifications { background-image: url(../images/22x22/notifications.png); }
              .icon22-authent { background-image: url(../images/22x22/authent.png); }
              .icon22-info { background-image: url(../images/22x22/info.png); }
              .icon22-comment { background-image: url(../images/22x22/comment.png); }
              .icon22-package { background-image: url(../images/22x22/package.png); }
              .icon22-settings { background-image: url(../images/22x22/settings.png); }
              .icon22-plugin { background-image: url(../images/22x22/plugin.png); }
              img.gravatar {
              	padding: 2px;
                border: solid 1px #d5d5d5;
                background: #fff;
              }
              div.issue img.gravatar {
              	float: right;
              	margin: 0 0 0 1em;
              	padding: 5px;
              }
              div.issue table img.gravatar {
              	height: 14px;
              	width: 14px;
              	padding: 2px;
              	float: left;
              	margin: 0 0.5em 0 0;
              }
              #history img.gravatar {
              	padding: 3px;
              	margin: 0 1.5em 1em 0;
              	float: left;
              }
              td.username img.gravatar {
              	float: left;
              	margin: 0 1em 0 0;
              }
              #activity dt img.gravatar {
              	float: left;
              	margin: 0 1em 1em 0;
              }
              #activity dt,
              .journal {
              	clear: left;
              }
              .gravatar-margin {
                margin-left: 40px;
              }
              h2 img { vertical-align:middle; }
              /***** Media print specific styles *****/
              @media print {
                #top-menu, #header, #main-menu, #sidebar, #footer, .contextual, .other-formats { display:none; }
                #main { background: #fff; }
                #content { width: 99%; margin: 0; padding: 0; border: 0; background: #fff; overflow: visible !important;}
              	#wiki_add_attachment { display:none; }
              }

test/fixtures/member_roles.yml +18 -2

              ---
              member_roles_001:
                id: 1
                role_id: 1
                member_id: 1
              member_roles_002:
                id: 2
                role_id: 2
                member_id: 2
              member_roles_003:
                id: 3
                role_id: 2
                member_id: 3
              member_roles_004:
                id: 4
                role_id: 2
                member_id: 4
              member_roles_005:
                id: 5
                role_id: 1
                member_id: 5
-  No newline at end of file
+             member_roles_006:
+               id: 6
+               role_id: 1
+               member_id: 6
+             member_roles_007:
+               id: 7
+               role_id: 2
+               member_id: 6
+             member_roles_008:
+               id: 8
+               role_id: 1
+               member_id: 7
+               inherited_from: 6
+             member_roles_009:
+               id: 9
+               role_id: 2
+               member_id: 7
+               inherited_from: 7

test/fixtures/members.yml +12 0

              ---
              members_001:
                created_on: 2006-07-19 19:35:33 +02:00
                project_id: 1
                id: 1
                user_id: 2
                mail_notification: true
              members_002:
                created_on: 2006-07-19 19:35:36 +02:00
                project_id: 1
                id: 2
                user_id: 3
                mail_notification: true
              members_003:
                created_on: 2006-07-19 19:35:36 +02:00
                project_id: 2
                id: 3
                user_id: 2
                mail_notification: true
              members_004:
                id: 4
                created_on: 2006-07-19 19:35:36 +02:00
                project_id: 1
                # Locked user
                user_id: 5
                mail_notification: true
              members_005:
                id: 5
                created_on: 2006-07-19 19:35:33 +02:00
                project_id: 5
                user_id: 2
                mail_notification: true
+             members_006:
+               id: 6
+               created_on: 2006-07-19 19:35:33 +02:00
+               project_id: 5
+               user_id: 10
+               mail_notification: false
+             members_007:
+               id: 7
+               created_on: 2006-07-19 19:35:33 +02:00
+               project_id: 5
+               user_id: 8
+               mail_notification: false
   No newline at end of file

test/fixtures/users.yml +8 0

              ---
              users_004:
                created_on: 2006-07-19 19:34:07 +02:00
                status: 1
                last_login_on:
                language: en
                hashed_password: 4e4aeb7baaf0706bd670263fef42dad15763b608
                updated_on: 2006-07-19 19:34:07 +02:00
                admin: false
                mail: rhill@somenet.foo
                lastname: Hill
                firstname: Robert
                id: 4
                auth_source_id:
                mail_notification: true
                login: rhill
                type: User
              users_001:
                created_on: 2006-07-19 19:12:21 +02:00
                status: 1
                last_login_on: 2006-07-19 22:57:52 +02:00
                language: en
                hashed_password: d033e22ae348aeb5660fc2140aec35850c4da997
                updated_on: 2006-07-19 22:57:52 +02:00
                admin: true
                mail: admin@somenet.foo
                lastname: Admin
                firstname: redMine
                id: 1
                auth_source_id:
                mail_notification: true
                login: admin
                type: User
              users_002:
                created_on: 2006-07-19 19:32:09 +02:00
                status: 1
                last_login_on: 2006-07-19 22:42:15 +02:00
                language: en
                hashed_password: a9a653d4151fa2c081ba1ffc2c2726f3b80b7d7d
                updated_on: 2006-07-19 22:42:15 +02:00
                admin: false
                mail: jsmith@somenet.foo
                lastname: Smith
                firstname: John
                id: 2
                auth_source_id:
                mail_notification: true
                login: jsmith
                type: User
              users_003:
                created_on: 2006-07-19 19:33:19 +02:00
                status: 1
                last_login_on:
                language: en
                hashed_password: 7feb7657aa7a7bf5aef3414a5084875f27192415
                updated_on: 2006-07-19 19:33:19 +02:00
                admin: false
                mail: dlopper@somenet.foo
                lastname: Lopper
                firstname: Dave
                id: 3
                auth_source_id:
                mail_notification: true
                login: dlopper
                type: User
              users_005:
                id: 5
                created_on: 2006-07-19 19:33:19 +02:00
                # Locked
                status: 3
                last_login_on:
                language: en
                hashed_password: 7feb7657aa7a7bf5aef3414a5084875f27192415
                updated_on: 2006-07-19 19:33:19 +02:00
                admin: false
                mail: dlopper2@somenet.foo
                lastname: Lopper2
                firstname: Dave2
                auth_source_id:
                mail_notification: true
                login: dlopper2
                type: User
              users_006:
                id: 6
                created_on: 2006-07-19 19:33:19 +02:00
                status: 1
                last_login_on:
                language: ''
                hashed_password: 1
                updated_on: 2006-07-19 19:33:19 +02:00
                admin: false
                mail: ''
                lastname: Anonymous
                firstname: ''
                auth_source_id:
                mail_notification: false
                login: ''
                type: AnonymousUser
              users_007:
                id: 7
                created_on: 2006-07-19 19:33:19 +02:00
                status: 1
                last_login_on:
                language: ''
                hashed_password: 1
                updated_on: 2006-07-19 19:33:19 +02:00
                admin: false
                mail: someone@foo.bar
                lastname: One
                firstname: Some
                auth_source_id:
                mail_notification: false
                login: someone
                type: User
              users_008:
                id: 8
                created_on: 2006-07-19 19:33:19 +02:00
                status: 1
                last_login_on:
                language: 'it'
                hashed_password: 1
                updated_on: 2006-07-19 19:33:19 +02:00
                admin: false
                mail: miscuser8@foo.bar
                lastname: Misc
                firstname: User
                auth_source_id:
                mail_notification: false
                login: miscuser8
                type: User
              users_009:
                id: 9
                created_on: 2006-07-19 19:33:19 +02:00
                status: 1
                last_login_on:
                language: 'it'
                hashed_password: 1
                updated_on: 2006-07-19 19:33:19 +02:00
                admin: false
                mail: miscuser9@foo.bar
                lastname: Misc
                firstname: User
                auth_source_id:
                mail_notification: false
                login: miscuser9
                type: User
+             groups_010:
+               id: 10
+               lastname: A Team
+               type: Group
+             groups_011:
+               id: 11
+               lastname: B Team
+               type: Group
   No newline at end of file

test/functional/members_controller_test.rb +5 -12

              # Redmine - project management software
              # 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
              # as published by the Free Software Foundation; either version 2
              # of the License, or (at your option) any later version.
              #
              # This program is distributed in the hope that it will be useful,
              # but WITHOUT ANY WARRANTY; without even the implied warranty of
              # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
              # GNU General Public License for more details.
              #
              # You should have received a copy of the GNU General Public License
              # along with this program; if not, write to the Free Software
              # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
              require File.dirname(__FILE__) + '/../test_helper'
              require 'members_controller'
              # Re-raise errors caught by the controller.
              class MembersController; def rescue_action(e) raise e end; end
              class MembersControllerTest < Test::Unit::TestCase
                fixtures :projects, :members, :member_roles, :roles, :users
                def setup
                  @controller = MembersController.new
                  @request    = ActionController::TestRequest.new
                  @response   = ActionController::TestResponse.new
                  User.current = nil
                  @request.session[:user_id] = 2
                end
                def test_members_routing
                  assert_routing(
                    {:method => :post, :path => 'projects/5234/members/new'},
                    :controller => 'members', :action => 'new', :id => '5234'
                  )
                end
                def test_create
                  assert_difference 'Member.count' do
                    post :new, :id => 1, :member => {:role_ids => [1], :user_id => 7}
                  end
                  assert_redirected_to '/projects/ecookbook/settings/members'
                  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]}
                  end
                  assert_redirected_to '/projects/ecookbook/settings/members'
                  assert User.find(7).member_of?(Project.find(1))
                end
                def test_edit
                  assert_no_difference 'Member.count' do
                    post :edit, :id => 2, :member => {:role_ids => [1], :user_id => 3}
                  end
                  assert_redirected_to '/projects/ecookbook/settings/members'
                end
                def test_destroy
                  assert_difference 'Member.count', -1 do
                    post :destroy, :id => 2
                  end
                  assert_redirected_to '/projects/ecookbook/settings/members'
                  assert !User.find(3).member_of?(Project.find(1))
                end
-               def test_autocomplete_for_member_login
-                 get :autocomplete_for_member_login, :id => 1, :user => 'mis'
+               def test_autocomplete_for_member
+                 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

              # redMine - project management software
              # Copyright (C) 2006  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
              # as published by the Free Software Foundation; either version 2
              # of the License, or (at your option) any later version.
              #
              # This program is distributed in the hope that it will be useful,
              # but WITHOUT ANY WARRANTY; without even the implied warranty of
              # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
              # GNU General Public License for more details.
              #
              # You should have received a copy of the GNU General Public License
              # along with this program; if not, write to the Free Software
              # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
              require "#{File.dirname(__FILE__)}/../test_helper"
              class AdminTest < ActionController::IntegrationTest
-               fixtures :users
+               fixtures :all
                def test_add_user
                  log_user("admin", "admin")
                  get "/users/add"
                  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
              end

test/unit/project_test.rb +12 0

              # redMine - project management software
              # Copyright (C) 2006-2007  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
              # as published by the Free Software Foundation; either version 2
              # of the License, or (at your option) any later version.
              #
              # This program is distributed in the hope that it will be useful,
              # but WITHOUT ANY WARRANTY; without even the implied warranty of
              # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
              # GNU General Public License for more details.
              #
              # You should have received a copy of the GNU General Public License
              # along with this program; if not, write to the Free Software
              # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
              require File.dirname(__FILE__) + '/../test_helper'
              class ProjectTest < Test::Unit::TestCase
                fixtures :projects, :enabled_modules,
                         :issues, :issue_statuses, :journals, :journal_details,
                         :users, :members, :member_roles, :roles, :projects_trackers, :trackers, :boards,
                         :queries
                def setup
                  @ecookbook = Project.find(1)
                  @ecookbook_sub1 = Project.find(3)
                end
                def test_truth
                  assert_kind_of Project, @ecookbook
                  assert_equal "eCookbook", @ecookbook.name
                end
                def test_update
                  assert_equal "eCookbook", @ecookbook.name
                  @ecookbook.name = "eCook"
                  assert @ecookbook.save, @ecookbook.errors.full_messages.join("; ")
                  @ecookbook.reload
                  assert_equal "eCook", @ecookbook.name
                end
                def test_validate
                  @ecookbook.name = ""
                  assert !@ecookbook.save
                  assert_equal 1, @ecookbook.errors.count
                  assert_equal I18n.translate('activerecord.errors.messages.blank'), @ecookbook.errors.on(:name)
                end
                def test_validate_identifier
                  to_test = {"abc" => true,
                             "ab12" => true,
                             "ab-12" => true,
                             "12" => false,
                             "new" => false}
                  to_test.each do |identifier, valid|
                    p = Project.new
                    p.identifier = identifier
                    p.valid?
                    assert_equal valid, p.errors.on('identifier').nil?
                  end
                end
+               def test_members_should_be_active_users
+                 Project.all.each do |project|
+                   assert_nil project.members.detect {|m| !(m.user.is_a?(User) && m.user.active?) }
+                 end
+               end
+               def test_users_should_be_active_users
+                 Project.all.each do |project|
+                   assert_nil project.users.detect {|u| !(u.is_a?(User) && u.active?) }
+                 end
+               end
                def test_archive
                  user = @ecookbook.members.first.user
                  @ecookbook.archive
                  @ecookbook.reload
                  assert !@ecookbook.active?
                  assert !user.projects.include?(@ecookbook)
                  # Subproject are also archived
                  assert !@ecookbook.children.empty?
                  assert @ecookbook.descendants.active.empty?
                end
                def test_unarchive
                  user = @ecookbook.members.first.user
                  @ecookbook.archive
                  # A subproject of an archived project can not be unarchived
                  assert !@ecookbook_sub1.unarchive
                  # Unarchive project
                  assert @ecookbook.unarchive
                  @ecookbook.reload
                  assert @ecookbook.active?
                  assert user.projects.include?(@ecookbook)
                  # Subproject can now be unarchived
                  @ecookbook_sub1.reload
                  assert @ecookbook_sub1.unarchive
                end
                def test_destroy
                  # 2 active members
                  assert_equal 2, @ecookbook.members.size
                  # and 1 is locked
                  assert_equal 3, Member.find(:all, :conditions => ['project_id = ?', @ecookbook.id]).size
                  # some boards
                  assert @ecookbook.boards.any?
                  @ecookbook.destroy
                  # make sure that the project non longer exists
                  assert_raise(ActiveRecord::RecordNotFound) { Project.find(@ecookbook.id) }
                  # make sure related data was removed
                  assert Member.find(:all, :conditions => ['project_id = ?', @ecookbook.id]).empty?
                  assert Board.find(:all, :conditions => ['project_id = ?', @ecookbook.id]).empty?
                end
                def test_move_an_orphan_project_to_a_root_project
                  sub = Project.find(2)
                  sub.set_parent! @ecookbook
                  assert_equal @ecookbook.id, sub.parent.id
                  @ecookbook.reload
                  assert_equal 4, @ecookbook.children.size
                end
                def test_move_an_orphan_project_to_a_subproject
                  sub = Project.find(2)
                  assert sub.set_parent!(@ecookbook_sub1)
                end
                def test_move_a_root_project_to_a_project
                  sub = @ecookbook
                  assert sub.set_parent!(Project.find(2))
                end
                def test_should_not_move_a_project_to_its_children
                  sub = @ecookbook
                  assert !(sub.set_parent!(Project.find(3)))
                end
                def test_set_parent_should_add_roots_in_alphabetical_order
                  ProjectCustomField.delete_all
                  Project.delete_all
                  Project.create!(:name => 'Project C', :identifier => 'project-c').set_parent!(nil)
                  Project.create!(:name => 'Project B', :identifier => 'project-b').set_parent!(nil)
                  Project.create!(:name => 'Project D', :identifier => 'project-d').set_parent!(nil)
                  Project.create!(:name => 'Project A', :identifier => 'project-a').set_parent!(nil)
                  assert_equal 4, Project.count
                  assert_equal Project.all.sort_by(&:name), Project.all.sort_by(&:lft)
                end
                def test_set_parent_should_add_children_in_alphabetical_order
                  ProjectCustomField.delete_all
                  parent = Project.create!(:name => 'Parent', :identifier => 'parent')
                  Project.create!(:name => 'Project C', :identifier => 'project-c').set_parent!(parent)
                  Project.create!(:name => 'Project B', :identifier => 'project-b').set_parent!(parent)
                  Project.create!(:name => 'Project D', :identifier => 'project-d').set_parent!(parent)
                  Project.create!(:name => 'Project A', :identifier => 'project-a').set_parent!(parent)
                  parent.reload
                  assert_equal 4, parent.children.size
                  assert_equal parent.children.sort_by(&:name), parent.children
                end
                def test_rebuild_should_sort_children_alphabetically
                  ProjectCustomField.delete_all
                  parent = Project.create!(:name => 'Parent', :identifier => 'parent')
                  Project.create!(:name => 'Project C', :identifier => 'project-c').move_to_child_of(parent)
                  Project.create!(:name => 'Project B', :identifier => 'project-b').move_to_child_of(parent)
                  Project.create!(:name => 'Project D', :identifier => 'project-d').move_to_child_of(parent)
                  Project.create!(:name => 'Project A', :identifier => 'project-a').move_to_child_of(parent)
                  Project.update_all("lft = NULL, rgt = NULL")
                  Project.rebuild!
                  parent.reload
                  assert_equal 4, parent.children.size
                  assert_equal parent.children.sort_by(&:name), parent.children
                end
                def test_parent
                  p = Project.find(6).parent
                  assert p.is_a?(Project)
                  assert_equal 5, p.id
                end
                def test_ancestors
                  a = Project.find(6).ancestors
                  assert a.first.is_a?(Project)
                  assert_equal [1, 5], a.collect(&:id)
                end
                def test_root
                  r = Project.find(6).root
                  assert r.is_a?(Project)
                  assert_equal 1, r.id
                end
                def test_children
                  c = Project.find(1).children
                  assert c.first.is_a?(Project)
                  assert_equal [5, 3, 4], c.collect(&:id)
                end
                def test_descendants
                  d = Project.find(1).descendants
                  assert d.first.is_a?(Project)
                  assert_equal [5, 6, 3, 4], d.collect(&:id)
                end
                def test_users_by_role
                  users_by_role = Project.find(1).users_by_role
                  assert_kind_of Hash, users_by_role
                  role = Role.find(1)
                  assert_kind_of Array, users_by_role[role]
                  assert users_by_role[role].include?(User.find(2))
                end
                def test_rolled_up_trackers
                  parent = Project.find(1)
                  parent.trackers = Tracker.find([1,2])
                  child = parent.children.find(3)
                  assert_equal [1, 2], parent.tracker_ids
                  assert_equal [2, 3], child.trackers.collect(&:id)
                  assert_kind_of Tracker, parent.rolled_up_trackers.first
                  assert_equal Tracker.find(1), parent.rolled_up_trackers.first
                  assert_equal [1, 2, 3], parent.rolled_up_trackers.collect(&:id)
                  assert_equal [2, 3], child.rolled_up_trackers.collect(&:id)
                end
                def test_rolled_up_trackers_should_ignore_archived_subprojects
                  parent = Project.find(1)
                  parent.trackers = Tracker.find([1,2])
                  child = parent.children.find(3)
                  child.trackers = Tracker.find([1,3])
                  parent.children.each(&:archive)
                  assert_equal [1,2], parent.rolled_up_trackers.collect(&:id)
                end
                def test_next_identifier
                  ProjectCustomField.delete_all
                  Project.create!(:name => 'last', :identifier => 'p2008040')
                  assert_equal 'p2008041', Project.next_identifier
                end
                def test_next_identifier_first_project
                  Project.delete_all
                  assert_nil Project.next_identifier
                end
                def test_enabled_module_names_should_not_recreate_enabled_modules
                  project = Project.find(1)
                  # Remove one module
                  modules = project.enabled_modules.slice(0..-2)
                  assert modules.any?
                  assert_difference 'EnabledModule.count', -1 do
                    project.enabled_module_names = modules.collect(&:name)
                  end
                  project.reload
                  # Ids should be preserved
                  assert_equal project.enabled_module_ids.sort, modules.collect(&:id).sort
                end
                def test_copy_from_existing_project
                  source_project = Project.find(1)
                  copied_project = Project.copy_from(1)
                  assert copied_project
                  # Cleared attributes
                  assert copied_project.id.blank?
                  assert copied_project.name.blank?
                  assert copied_project.identifier.blank?
                  # Duplicated attributes
                  assert_equal source_project.description, copied_project.description
                  assert_equal source_project.enabled_modules, copied_project.enabled_modules
                  assert_equal source_project.trackers, copied_project.trackers
                  # Default attributes
                  assert_equal 1, copied_project.status
                end
                # Context: Project#copy
                def test_copy_should_copy_issues
                  # Setup
                  ProjectCustomField.destroy_all # Custom values are a mess to isolate in tests
                  source_project = Project.find(2)
                  Project.destroy_all :identifier => "copy-test"
                  project = Project.new(:name => 'Copy Test', :identifier => 'copy-test')
                  project.trackers = source_project.trackers
                  assert project.valid?
                  assert project.issues.empty?
                  assert project.copy(source_project)
                  # Tests
                  assert_equal source_project.issues.size, project.issues.size
                  project.issues.each do |issue|
                    assert issue.valid?
                    assert ! issue.assigned_to.blank?
                    assert_equal project, issue.project
                  end
                end
                def test_copy_should_copy_members
                  # Setup
                  ProjectCustomField.destroy_all # Custom values are a mess to isolate in tests
                  source_project = Project.find(2)
                  project = Project.new(:name => 'Copy Test', :identifier => 'copy-test')
                  project.trackers = source_project.trackers
                  project.enabled_modules = source_project.enabled_modules
                  assert project.valid?
                  assert project.members.empty?
                  assert project.copy(source_project)
                  # Tests
                  assert_equal source_project.members.size, project.members.size
                  project.members.each do |member|
                    assert member
                    assert_equal project, member.project
                  end
                end
                def test_copy_should_copy_project_level_queries
                  # Setup
                  ProjectCustomField.destroy_all # Custom values are a mess to isolate in tests
                  source_project = Project.find(2)
                  project = Project.new(:name => 'Copy Test', :identifier => 'copy-test')
                  project.trackers = source_project.trackers
                  project.enabled_modules = source_project.enabled_modules
                  assert project.valid?
                  assert project.queries.empty?
                  assert project.copy(source_project)
                  # Tests
                  assert_equal source_project.queries.size, project.queries.size
                  project.queries.each do |query|
                    assert query
                    assert_equal project, query.project
                  end
                end
              end

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