jro_apps/redmine Commit - r2627:7dccf9fda6f3

0

app/models/member_role.rb created 644 +27 0

@@ -0,0 +1,27
	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 MemberRole < ActiveRecord::Base
	19	belongs_to :member
	20	belongs_to :role
	21
	22	validates_presence_of :role
	23
	24	def validate
	25	errors.add :role_id, :invalid if role && !role.member?
	26	end
	27	end

0

db/migrate/20090503121501_create_member_roles.rb created 644 +12 0

@@ -0,0 +1,12
	1	class CreateMemberRoles < ActiveRecord::Migration
	2	def self.up
	3	create_table :member_roles do \|t\|
	4	t.column :member_id, :integer, :null => false
	5	t.column :role_id, :integer, :null => false
	6	end
	7	end
	8
	9	def self.down
	10	drop_table :member_roles
	11	end
	12	end

0

db/migrate/20090503121505_populate_member_roles.rb created 644 +11 0

@@ -0,0 +1,11
	1	class PopulateMemberRoles < ActiveRecord::Migration
	2	def self.up
	3	Member.find(:all).each do \|member\|
	4	MemberRole.create!(:member_id => member.id, :role_id => member.role_id)
	5	end
	6	end
	7
	8	def self.down
	9	MemberRole.delete_all
	10	end
	11	end

0

db/migrate/20090503121510_drop_members_role_id.rb created 644 +9 0

@@ -0,0 +1,9
	1	class DropMembersRoleId < ActiveRecord::Migration
	2	def self.up
	3	remove_column :members, :role_id
	4	end
	5
	6	def self.down
	7	raise IrreversibleMigration
	8	end
	9	end

0

test/fixtures/member_roles.yml created 644 +23 0

@@ -0,0 +1,23
	1	---
	2	member_roles_001:
	3	id: 1
	4	role_id: 1
	5	member_id: 1
	6	member_roles_002:
	7	id: 2
	8	role_id: 2
	9	member_id: 2
	10	member_roles_003:
	11	id: 3
	12	role_id: 2
	13	member_id: 3
	14	member_roles_004:
	15	id: 4
	16	role_id: 2
	17	member_id: 4
	18	member_roles_005:
	19	id: 5
	20	role_id: 1
	21	member_id: 5
	22
	23	No newline at end of file

0

app/controllers/application.rb 0 -4

                 require_dependency "repository/#{scm.underscore}"
               end
-              def current_role
-                @current_role ||= User.current.role_for_project(@project)
-              end
               def user_setup
                 # Check the settings cache for each request
                 Setting.check_cache

0

app/controllers/issues_controller.rb +1 -1

                   return
                 end
                 @issue.status = default_status
-                @allowed_statuses = ([default_status] + default_status.find_new_statuses_allowed_to(User.current.role_for_project(@project), @issue.tracker)).uniq
+                @allowed_statuses = ([default_status] + default_status.find_new_statuses_allowed_to(User.current.roles_for_project(@project), @issue.tracker)).uniq
                 if request.get? || request.xhr?
                   @issue.start_date ||= Date.today

0

app/controllers/members_controller.rb +6 -1

                 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'} }
+                    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

0

app/controllers/projects_controller.rb +1 -1

                   redirect_to_project_menu_item(@project, params[:jump]) && return
                 end
-                @members_by_role = @project.members.find(:all, :include => [:user, :role], :order => 'position').group_by {|m| m.role}
+                @members_by_role = @project.members.find(:all, :include => [:user, :roles], :order => 'position').group_by {|m| m.roles.first}
                 @subprojects = @project.children.visible
                 @news = @project.news.find(:all, :limit => 5, :include => [ :author, :project ], :order => "#{News.table_name}.created_on DESC")
                 @trackers = @project.rolled_up_trackers

0

app/controllers/queries_controller.rb +2 -2

                 @query = Query.new(params[:query])
                 @query.project = params[:query_is_for_all] ? nil : @project
                 @query.user = User.current
-                @query.is_public = false unless (@query.project && current_role.allowed_to?(:manage_public_queries)) || User.current.admin?
+                @query.is_public = false unless User.current.allowed_to?(:manage_public_queries, @project) || User.current.admin?
                 @query.column_names = nil if params[:default_columns]
                 params[:fields].each do |field|
                   end if params[:fields]
                   @query.attributes = params[:query]
                   @query.project = nil if params[:query_is_for_all]
-                  @query.is_public = false unless (@query.project && current_role.allowed_to?(:manage_public_queries)) || User.current.admin?
+                  @query.is_public = false unless User.current.allowed_to?(:manage_public_queries, @project) || User.current.admin?
                   @query.column_names = nil if params[:default_columns]
                   if @query.save

0

app/controllers/roles_controller.rb +4 -4

                     @role.workflows.copy(copy_from)
                   end
                   flash[:notice] = l(:notice_successful_create)
-                  redirect_to :action => 'list'
+                  redirect_to :action => 'index'
                 end
                 @permissions = @role.setable_permissions
                 @roles = Role.find :all, :order => 'builtin, position'
                 @role = Role.find(params[:id])
                 if request.post? and @role.update_attributes(params[:role])
                   flash[:notice] = l(:notice_successful_update)
-                  redirect_to :action => 'list'
+                  redirect_to :action => 'index'
                 end
                 @permissions = @role.setable_permissions
               end
               def destroy
                 @role = Role.find(params[:id])
                 @role.destroy
-                redirect_to :action => 'list'
+                redirect_to :action => 'index'
               rescue
                 flash[:error] = 'This role is in use and can not be deleted.'
                 redirect_to :action => 'index'
                     role.save
                   end
                   flash[:notice] = l(:notice_successful_update)
-                  redirect_to :action => 'list'
+                  redirect_to :action => 'index'
                 end
               end
             end

0

app/controllers/users_controller.rb +13 -5

                   end
                 end
                 @auth_sources = AuthSource.find(:all)
-                @roles = Role.find_all_givable
-                @projects = Project.active.find(:all, :order => 'lft')
                 @membership ||= Member.new
-                @memberships = @user.memberships
               end
               def edit_membership
                 @membership = params[:membership_id] ? Member.find(params[:membership_id]) : Member.new(:user => @user)
                 @membership.attributes = params[:membership]
                 @membership.save if request.post?
-                redirect_to :action => 'edit', :id => @user, :tab => 'memberships'
+                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?
-                redirect_to :action => 'edit', :id => @user, :tab => 'memberships'
+                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

0

app/helpers/application_helper.rb 0 -4

               extend Forwardable
               def_delegators :wiki_helper, :wikitoolbar_for, :heads_for_wiki_formatter
-              def current_role
-                @current_role ||= User.current.role_for_project(@project)
-              end
               # 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)

0

app/models/issue.rb +1 -1

               # Returns an array of status that user is able to apply
               def new_statuses_allowed_to(user)
-                statuses = status.find_new_statuses_allowed_to(user.role_for_project(project), tracker)
+                statuses = status.find_new_statuses_allowed_to(user.roles_for_project(project), tracker)
                 statuses << status unless statuses.empty?
                 statuses.uniq.sort
               end

0

app/models/issue_status.rb +21 -11

@@ -36,24 +36,34 class IssueStatus < ActiveRecord::Base
36		36
37	# Returns an array of all statuses the given role can switch to	37	# Returns an array of all statuses the given role can switch to
38	# Uses association cache when called more than one time	38	# Uses association cache when called more than one time
39	def new_statuses_allowed_to(role, tracker)	39	def new_statuses_allowed_to(roles, tracker)
40	new_statuses = workflows.select {\|w\| w.role_id == role.id && w.tracker_id == tracker.id}.collect{\|w\| w.new_status} if role && tracker	40	if roles && tracker
41	new_statuses ? new_statuses.compact.sort{\|x, y\| x.position <=> y.position } : []	41	role_ids = roles.collect(&:id)
		42	new_statuses = workflows.select {\|w\| role_ids.include?(w.role_id) && w.tracker_id == tracker.id}.collect{\|w\| w.new_status}.compact.sort
		43	else
		44	[]
		45	end
42	end	46	end
43		47
44	# Same thing as above but uses a database query	48	# Same thing as above but uses a database query
45	# More efficient than the previous method if called just once	49	# More efficient than the previous method if called just once
46	def find_new_statuses_allowed_to(role, tracker)	50	def find_new_statuses_allowed_to(roles, tracker)
47	new_statuses = workflows.find(:all,	51	if roles && tracker
48	:include => :new_status,	52	workflows.find(:all,
49	:conditions => ["role_id=? and tracker_id=?", role.id, tracker.id]).collect{ \|w\| w.new_status }.compact if role && tracker	53	:include => :new_status,
50	new_statuses ? new_statuses.sort{\|x, y\| x.position <=> y.position } : []	54	:conditions => { :role_id => roles.collect(&:id),
		55	:tracker_id => tracker.id}).collect{ \|w\| w.new_status }.compact.sort
		56	else
		57	[]
		58	end
51	end	59	end
52		60
53	def new_status_allowed_to?(status, role, tracker)	61	def new_status_allowed_to?(status, roles, tracker)
54	status && role && tracker ?	62	if status && roles && tracker
55	!workflows.find(:first, :conditions => {:new_status_id => status.id, :role_id => role.id, :tracker_id => tracker.id}).nil? :	63	!workflows.find(:first, :conditions => {:new_status_id => status.id, :role_id => roles.collect(&:id), :tracker_id => tracker.id}).nil?
		64	else
56	false	65	false
		66	end
57	end	67	end
58		68
59	def <=>(status)	69	def <=>(status)

0

app/models/member.rb +13 -9

-            # redMine - project management software
+            # Redmine - project management software
-            # Copyright (C) 2006  Jean-Philippe Lang
+            # Copyright (C) 2006-2009  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             class Member < ActiveRecord::Base
               belongs_to :user
-              belongs_to :role
+              has_many :member_roles, :dependent => :delete_all
+              has_many :roles, :through => :member_roles
               belongs_to :project
-              validates_presence_of :role, :user, :project
+              validates_presence_of :user, :project
               validates_uniqueness_of :user_id, :scope => :project_id
-              def validate
-                errors.add :role_id, :invalid if role && !role.member?
-              end
               def name
                 self.user.name
               end
               def <=>(member)
-                role == member.role ? (user <=> member.user) : (role <=> member.role)
+                a, b = roles.sort.first, member.roles.sort.first
+                a == b ? (user <=> member.user) : (a <=> b)
               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]
               end
+              protected
+              def validate
+                errors.add_to_base "Role can't be blank" if roles.empty?
+              end
             end

0

app/models/project.rb +4 -2

                   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.role.allowed_to?(permission)}.collect {|m| m.project_id}
+                    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
               # 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.role.assignable?}.collect {|m| m.user}.sort
+                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

0

app/models/role.rb +7 -2

                 end
               end
-              has_many :members
+              has_many :member_roles, :dependent => :destroy
+              has_many :members, :through => :member_roles
               acts_as_list
               serialize :permissions, Array
               end
               def <=>(role)
-                position <=> role.position
+                role ? position <=> role.position : -1
+              end
+              def to_s
+                name
               end
               # Return true if the role is a builtin role

0

app/models/user.rb +14 -10

                 :username => '#{login}'
               }
-              has_many :memberships, :class_name => 'Member', :include => [ :project, :role ], :conditions => "#{Project.table_name}.status=#{Project::STATUS_ACTIVE}", :order => "#{Project.table_name}.name"
+              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_many :issue_categories, :foreign_key => 'assigned_to_id', :dependent => :nullify
                 !logged?
               end
-              # Return user's role for project
+              # Return user's roles for project
-              def role_for_project(project)
+              def roles_for_project(project)
+                roles = []
                 # No role on archived projects
-                return nil unless project && project.active?
+                return roles unless project && project.active?
                 if logged?
                   # Find project membership
                   membership = memberships.detect {|m| m.project_id == project.id}
                   if membership
-                    membership.role
+                    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)
-                role_for_project(project).member?
+                !roles_for_project(project).detect {|role| role.member?}.nil?
               end
               # Return true if the user is allowed to do the specified action on project
                   # Admin users are authorized for anything else
                   return true if admin?
-                  role = role_for_project(project)
+                  roles = roles_for_project(project)
-                  return false unless role
+                  return false unless roles
-                  role.allowed_to?(action) && (project.is_public? || role.member?)
+                  roles.detect {|role| (project.is_public? || role.member?) && role.allowed_to?(action)}
                 elsif options[:global]
                   # authorize if user has at least one role that has this permission
-                  roles = memberships.collect {|m| m.role}.uniq
+                  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

0

app/views/account/show.rhtml +1 -1

             <ul>
             <% for membership in @memberships %>
             	<li><%= link_to(h(membership.project.name), :controller => 'projects', :action => 'show', :id => membership.project) %>
-                (<%=h membership.role.name %>, <%= format_date(membership.created_on) %>)</li>
+                (<%=h membership.roles.collect(&:to_s).join(', ') %>, <%= format_date(membership.created_on) %>)</li>
             <% end %>
             </ul>
             <% end %>

0

app/views/projects/settings/_members.rhtml +25 -15

             <%= error_messages_for 'member' %>
             <% roles = Role.find_all_givable
-               members = @project.members.find(:all, :include => [:role, :user]).sort %>
+               members = @project.members.find(:all, :include => [:roles, :user]).sort %>
             <div class="splitcontentleft">
             <% if members.any? %>
-            <table class="list">
+            <table class="list members">
             	<thead>
             	  <th><%= l(:label_user) %></th>
-            	  <th><%= l(:label_role) %></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' %>">
+            	<tr id="member-<%= member.id %>" class="<%= cycle 'odd', 'even' %> member">
-            	<td><%=h member.name %></td>
+            	<td class="user"><%= link_to_user member.user %></td>
-                <td align="center">
+              <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) do |f| %>
+                  <% remote_form_for(:member, member, :url => {:controller => 'members', :action => 'edit', :id => member},
-                    <%= f.select :role_id, roles.collect{|role| [role.name, role.id]}, {}, :class => "small" %>
+                  																		:method => :post,
-                    <%= submit_tag l(:button_change), :class => "small" %>
+                  																		: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 />
+                    <% end %></p>
+                    <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>
-                <td align="center">
+              <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},
                                                           :method => :post
                                                         }, :title => l(:button_delete),
                                                            :class => 'icon icon-del' %>
-                </td>
+              </td>
-                <%= call_hook(:view_projects_settings_members_table_row, { :project => @project, :member => member}) %>
+              <%= call_hook(:view_projects_settings_members_table_row, { :project => @project, :member => member}) %>
             	</tr>
             	</tbody>
             <% end; reset_cycle %>
             			<% end -%>
             			</div>
             		<% end %>
-                <p><%= l(:label_role) %>: <%= f.select :role_id, roles.collect{|role| [role.name, role.id]}, :selected => nil %>
+                <p><%= l(:label_role_plural) %>:
-                <%= submit_tag l(:button_add) %></p>
+                <% 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 %>

0

app/views/queries/_form.rhtml +1 -1

             <p><label for="query_name"><%=l(:field_name)%></label>
             <%= text_field 'query', 'name', :size => 80 %></p>
-            <% if User.current.admin? || (@project && current_role.allowed_to?(:manage_public_queries)) %>
+            <% if User.current.admin? || User.current.allowed_to?(:manage_public_queries, @project) %>
             <p><label for="query_is_public"><%=l(:field_is_public)%></label>
             <%= check_box 'query', 'is_public',
                   :onchange => (User.current.admin? ? nil : 'if (this.checked) {$("query_is_for_all").checked = false; $("query_is_for_all").disabled = true;} else {$("query_is_for_all").disabled = false;}') %></p>

0

app/views/users/_memberships.rhtml +38 -22

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

0

app/views/workflows/edit.rhtml +1 -1

             	<% for old_status in @statuses %>
             		<tr class="<%= cycle("odd", "even") %>">
             		<td><%= old_status.name %></td>
-            		<% new_status_ids_allowed = old_status.find_new_statuses_allowed_to(@role, @tracker).collect(&:id) -%>
+            		<% new_status_ids_allowed = old_status.find_new_statuses_allowed_to([@role], @tracker).collect(&:id) -%>
             		<% for new_status in @statuses -%>
             			<td align="center">
                   <input type="checkbox"

0

public/stylesheets/application.css +9 -5

             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; }
             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); }
             a.atom { background: url(../images/feed.png) no-repeat 1px 50%; padding: 2px 0px 3px 16px; }
             /* Project members tab */
-            div#tab-content-members .splitcontentleft { width: 64% }
+            div#tab-content-members .splitcontentleft, div#tab-content-memberships .splitcontentleft { width: 64% }
-            div#tab-content-members .splitcontentright { width: 34% }
+            div#tab-content-members .splitcontentright, div#tab-content-memberships .splitcontentright { width: 34% }
-            div#tab-content-members fieldset { padding:1em; margin-bottom: 1em; }
+            div#tab-content-members fieldset, div#tab-content-memberships fieldset { padding:1em; margin-bottom: 1em; }
-            div#tab-content-members fieldset legend { font-weight: bold; }
+            div#tab-content-members fieldset legend, div#tab-content-memberships fieldset legend { font-weight: bold; }
-            div#tab-content-members fieldset label { display: block; }
+            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; }
             * html div#tab-content-members fieldset div { height: 450px; }

0

test/fixtures/members.yml 0 -5

             members_001:
               created_on: 2006-07-19 19:35:33 +02:00
               project_id: 1
-              role_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
-              role_id: 2
               id: 2
               user_id: 3
               mail_notification: true
             members_003:
               created_on: 2006-07-19 19:35:36 +02:00
               project_id: 2
-              role_id: 2
               id: 3
               user_id: 2
               mail_notification: true
               id: 4
               created_on: 2006-07-19 19:35:36 +02:00
               project_id: 1
-              role_id: 2
               # Locked user
               user_id: 5
               mail_notification: true
               id: 5
               created_on: 2006-07-19 19:35:33 +02:00
               project_id: 5
-              role_id: 1
               user_id: 2
               mail_notification: true
   No newline at end of file

0

test/functional/attachments_controller_test.rb +1 -1

             class AttachmentsControllerTest < Test::Unit::TestCase
-              fixtures :users, :projects, :roles, :members, :enabled_modules, :issues, :trackers, :attachments,
+              fixtures :users, :projects, :roles, :members, :member_roles, :enabled_modules, :issues, :trackers, :attachments,
                        :versions, :wiki_pages, :wikis, :documents
               def setup

0

test/functional/boards_controller_test.rb +1 -1

             class BoardsController; def rescue_action(e) raise e end; end
             class BoardsControllerTest < Test::Unit::TestCase
-              fixtures :projects, :users, :members, :roles, :boards, :messages, :enabled_modules
+              fixtures :projects, :users, :members, :member_roles, :roles, :boards, :messages, :enabled_modules
               def setup
                 @controller = BoardsController.new

0

test/functional/documents_controller_test.rb +1 -1

             class DocumentsController; def rescue_action(e) raise e end; end
             class DocumentsControllerTest < Test::Unit::TestCase
-              fixtures :projects, :users, :roles, :members, :enabled_modules, :documents, :enumerations
+              fixtures :projects, :users, :roles, :members, :member_roles, :enabled_modules, :documents, :enumerations
               def setup
                 @controller = DocumentsController.new

0

test/functional/issue_categories_controller_test.rb +1 -1

             class IssueCategoriesController; def rescue_action(e) raise e end; end
             class IssueCategoriesControllerTest < Test::Unit::TestCase
-              fixtures :projects, :users, :members, :roles, :enabled_modules, :issue_categories
+              fixtures :projects, :users, :members, :member_roles, :roles, :enabled_modules, :issue_categories
               def setup
                 @controller = IssueCategoriesController.new

0

test/functional/issue_relations_controller_test.rb +1 0

                        :users,
                        :roles,
                        :members,
+                       :member_roles,
                        :issues,
                        :issue_statuses,
                        :enabled_modules,

0

test/functional/issues_controller_test.rb +1 0

                        :users,
                        :roles,
                        :members,
+                       :member_roles,
                        :issues,
                        :issue_statuses,
                        :versions,

0

test/functional/journals_controller_test.rb +1 -1

             class JournalsController; def rescue_action(e) raise e end; end
             class JournalsControllerTest < Test::Unit::TestCase
-              fixtures :projects, :users, :members, :roles, :issues, :journals, :journal_details, :enabled_modules
+              fixtures :projects, :users, :members, :member_roles, :roles, :issues, :journals, :journal_details, :enabled_modules
               def setup
                 @controller = JournalsController.new

0

test/functional/mail_handler_controller_test.rb +1 -1

             class MailHandlerController; def rescue_action(e) raise e end; end
             class MailHandlerControllerTest < Test::Unit::TestCase
-              fixtures :users, :projects, :enabled_modules, :roles, :members, :issues, :issue_statuses, :trackers, :enumerations
+              fixtures :users, :projects, :enabled_modules, :roles, :members, :member_roles, :issues, :issue_statuses, :trackers, :enumerations
               FIXTURES_PATH = File.dirname(__FILE__) + '/../fixtures/mail_handler'

0

test/functional/members_controller_test.rb +5 -5

             class MembersControllerTest < Test::Unit::TestCase
-              fixtures :projects, :members, :roles, :users
+              fixtures :projects, :members, :member_roles, :roles, :users
               def setup
                 @controller = MembersController.new
               def test_create
                 assert_difference 'Member.count' do
-                  post :new, :id => 1, :member => {:role_id => 1, :user_id => 7}
+                  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))
               def test_create_by_user_login
                 assert_difference 'Member.count' do
-                  post :new, :id => 1, :member => {:role_id => 1, :user_login => 'someone'}
+                  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))
               def test_create_multiple
                 assert_difference 'Member.count', 3 do
-                  post :new, :id => 1, :member => {:role_id => 1, :user_ids => [7, 8, 9]}
+                  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))
               def test_edit
                 assert_no_difference 'Member.count' do
-                  post :edit, :id => 2, :member => {:role_id => 1, :user_id => 3}
+                  post :edit, :id => 2, :member => {:role_ids => [1], :user_id => 3}
                 end
                 assert_redirected_to '/projects/ecookbook/settings/members'
               end

0

test/functional/messages_controller_test.rb +1 -1

             class MessagesController; def rescue_action(e) raise e end; end
             class MessagesControllerTest < Test::Unit::TestCase
-              fixtures :projects, :users, :members, :roles, :boards, :messages, :enabled_modules
+              fixtures :projects, :users, :members, :member_roles, :roles, :boards, :messages, :enabled_modules
               def setup
                 @controller = MessagesController.new

0

test/functional/news_controller_test.rb +1 -1

             class NewsController; def rescue_action(e) raise e end; end
             class NewsControllerTest < Test::Unit::TestCase
-              fixtures :projects, :users, :roles, :members, :enabled_modules, :news, :comments
+              fixtures :projects, :users, :roles, :members, :member_roles, :enabled_modules, :news, :comments
               def setup
                 @controller = NewsController.new

0

test/functional/projects_controller_test.rb +1 -1

             class ProjectsController; def rescue_action(e) raise e end; end
             class ProjectsControllerTest < Test::Unit::TestCase
-              fixtures :projects, :versions, :users, :roles, :members, :issues, :journals, :journal_details,
+              fixtures :projects, :versions, :users, :roles, :members, :member_roles, :issues, :journals, :journal_details,
                        :trackers, :projects_trackers, :issue_statuses, :enabled_modules, :enumerations, :boards, :messages,
                        :attachments

0

test/functional/queries_controller_test.rb +1 -1

             class QueriesController; def rescue_action(e) raise e end; end
             class QueriesControllerTest < Test::Unit::TestCase
-              fixtures :projects, :users, :members, :roles, :trackers, :issue_statuses, :issue_categories, :enumerations, :issues, :custom_fields, :custom_values, :queries
+              fixtures :projects, :users, :members, :member_roles, :roles, :trackers, :issue_statuses, :issue_categories, :enumerations, :issues, :custom_fields, :custom_values, :queries
               def setup
                 @controller = QueriesController.new

0

test/functional/repositories_bazaar_controller_test.rb +1 -1

             class RepositoriesController; def rescue_action(e) raise e end; end
             class RepositoriesBazaarControllerTest < Test::Unit::TestCase
-              fixtures :projects, :users, :roles, :members, :repositories, :enabled_modules
+              fixtures :projects, :users, :roles, :members, :member_roles, :repositories, :enabled_modules
               # No '..' in the repository path
               REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/bazaar_repository'

0

test/functional/repositories_controller_test.rb +1 -1

             class RepositoriesController; def rescue_action(e) raise e end; end
             class RepositoriesControllerTest < Test::Unit::TestCase
-              fixtures :projects, :users, :roles, :members, :repositories, :issues, :issue_statuses, :changesets, :changes, :issue_categories, :enumerations, :custom_fields, :custom_values, :trackers
+              fixtures :projects, :users, :roles, :members, :member_roles, :repositories, :issues, :issue_statuses, :changesets, :changes, :issue_categories, :enumerations, :custom_fields, :custom_values, :trackers
               def setup
                 @controller = RepositoriesController.new

0

test/functional/repositories_darcs_controller_test.rb +1 -1

             class RepositoriesController; def rescue_action(e) raise e end; end
             class RepositoriesDarcsControllerTest < Test::Unit::TestCase
-              fixtures :projects, :users, :roles, :members, :repositories, :enabled_modules
+              fixtures :projects, :users, :roles, :members, :member_roles, :repositories, :enabled_modules
               # No '..' in the repository path
               REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/darcs_repository'

0

test/functional/repositories_git_controller_test.rb +1 -1

             class RepositoriesController; def rescue_action(e) raise e end; end
             class RepositoriesGitControllerTest < Test::Unit::TestCase
-              fixtures :projects, :users, :roles, :members, :repositories, :enabled_modules
+              fixtures :projects, :users, :roles, :members, :member_roles, :repositories, :enabled_modules
               # No '..' in the repository path
               REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/git_repository'

0

test/functional/repositories_mercurial_controller_test.rb +1 -1

             class RepositoriesController; def rescue_action(e) raise e end; end
             class RepositoriesMercurialControllerTest < Test::Unit::TestCase
-              fixtures :projects, :users, :roles, :members, :repositories, :enabled_modules
+              fixtures :projects, :users, :roles, :members, :member_roles, :repositories, :enabled_modules
               # No '..' in the repository path
               REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/mercurial_repository'

0

test/functional/repositories_subversion_controller_test.rb +1 -1

             class RepositoriesController; def rescue_action(e) raise e end; end
             class RepositoriesSubversionControllerTest < Test::Unit::TestCase
-              fixtures :projects, :users, :roles, :members, :enabled_modules,
+              fixtures :projects, :users, :roles, :members, :member_roles, :enabled_modules,
                        :repositories, :issues, :issue_statuses, :changesets, :changes,
                        :issue_categories, :enumerations, :custom_fields, :custom_values, :trackers

0

test/functional/roles_controller_test.rb +11 -11

             class RolesController; def rescue_action(e) raise e end; end
             class RolesControllerTest < Test::Unit::TestCase
-              fixtures :roles, :users, :members, :workflows
+              fixtures :roles, :users, :members, :member_roles, :workflows
               def setup
                 @controller = RolesController.new
                                      :permissions => ['add_issues', 'edit_issues', 'log_time', ''],
                                      :assignable => '0'}
-                assert_redirected_to 'roles/list'
+                assert_redirected_to 'roles'
                 role = Role.find_by_name('RoleWithoutWorkflowCopy')
                 assert_not_nil role
                 assert_equal [:add_issues, :edit_issues, :log_time], role.permissions
                                      :assignable => '0'},
                            :copy_workflow_from => '1'
-                assert_redirected_to 'roles/list'
+                assert_redirected_to 'roles'
                 role = Role.find_by_name('RoleWithWorkflowCopy')
                 assert_not_nil role
                 assert_equal Role.find(1).workflows.size, role.workflows.size
                                       :permissions => ['edit_project', ''],
                                       :assignable => '0'}
-                assert_redirected_to 'roles/list'
+                assert_redirected_to 'roles'
                 role = Role.find(1)
                 assert_equal [:edit_project], role.permissions
               end
                 assert r.save
                 post :destroy, :id => r
-                assert_redirected_to 'roles/list'
+                assert_redirected_to 'roles'
                 assert_nil Role.find_by_id(r.id)
               end
               def test_post_report
                 post :report, :permissions => { '0' => '', '1' => ['edit_issues'], '3' => ['add_issues', 'delete_issues']}
-                assert_redirected_to 'roles/list'
+                assert_redirected_to 'roles'
                 assert_equal [:edit_issues], Role.find(1).permissions
                 assert_equal [:add_issues, :delete_issues], Role.find(3).permissions
               def test_clear_all_permissions
                 post :report, :permissions => { '0' => '' }
-                assert_redirected_to 'roles/list'
+                assert_redirected_to 'roles'
                 assert Role.find(1).permissions.empty?
               end
               def test_move_highest
                 post :edit, :id => 3, :role => {:move_to => 'highest'}
-                assert_redirected_to 'roles/list'
+                assert_redirected_to 'roles'
                 assert_equal 1, Role.find(3).position
               end
               def test_move_higher
                 position = Role.find(3).position
                 post :edit, :id => 3, :role => {:move_to => 'higher'}
-                assert_redirected_to 'roles/list'
+                assert_redirected_to 'roles'
                 assert_equal position - 1, Role.find(3).position
               end
               def test_move_lower
                 position = Role.find(2).position
                 post :edit, :id => 2, :role => {:move_to => 'lower'}
-                assert_redirected_to 'roles/list'
+                assert_redirected_to 'roles'
                 assert_equal position + 1, Role.find(2).position
               end
               def test_move_lowest
                 post :edit, :id => 2, :role => {:move_to => 'lowest'}
-                assert_redirected_to 'roles/list'
+                assert_redirected_to 'roles'
                 assert_equal Role.count, Role.find(2).position
               end
             end

0

test/functional/search_controller_test.rb +1 -1

             class SearchController; def rescue_action(e) raise e end; end
             class SearchControllerTest < Test::Unit::TestCase
-              fixtures :projects, :enabled_modules, :roles, :users,
+              fixtures :projects, :enabled_modules, :roles, :users, :members, :member_roles,
                        :issues, :trackers, :issue_statuses,
                        :custom_fields, :custom_values,
                        :repositories, :changesets

0

test/functional/timelog_controller_test.rb +1 -1

             class TimelogController; def rescue_action(e) raise e end; end
             class TimelogControllerTest < Test::Unit::TestCase
-              fixtures :projects, :enabled_modules, :roles, :members, :issues, :time_entries, :users, :trackers, :enumerations, :issue_statuses, :custom_fields, :custom_values
+              fixtures :projects, :enabled_modules, :roles, :members, :member_roles, :issues, :time_entries, :users, :trackers, :enumerations, :issue_statuses, :custom_fields, :custom_values
               def setup
                 @controller = TimelogController.new

0

test/functional/users_controller_test.rb +3 -3

             class UsersControllerTest < Test::Unit::TestCase
               include Redmine::I18n
-              fixtures :users, :projects, :members
+              fixtures :users, :projects, :members, :member_roles, :roles
               def setup
                 @controller = UsersController.new
               def test_edit_membership
                 post :edit_membership, :id => 2, :membership_id => 1,
-                                       :membership => { :role_id => 2}
+                                       :membership => { :role_ids => [2]}
                 assert_redirected_to :action => 'edit', :id => '2', :tab => 'memberships'
-                assert_equal 2, Member.find(1).role_id
+                assert_equal [2], Member.find(1).role_ids
               end
               def test_edit_with_activation_should_send_a_notification

0

test/functional/versions_controller_test.rb +1 -1

             class VersionsController; def rescue_action(e) raise e end; end
             class VersionsControllerTest < Test::Unit::TestCase
-              fixtures :projects, :versions, :issues, :users, :roles, :members, :enabled_modules
+              fixtures :projects, :versions, :issues, :users, :roles, :members, :member_roles, :enabled_modules
               def setup
                 @controller = VersionsController.new

0

test/functional/watchers_controller_test.rb +1 -1

             class WatchersController; def rescue_action(e) raise e end; end
             class WatchersControllerTest < Test::Unit::TestCase
-              fixtures :projects, :users, :roles, :members, :enabled_modules,
+              fixtures :projects, :users, :roles, :members, :member_roles, :enabled_modules,
                        :issues, :trackers, :projects_trackers, :issue_statuses, :enumerations, :watchers
               def setup

0

test/functional/wiki_controller_test.rb +1 -1

             class WikiController; def rescue_action(e) raise e end; end
             class WikiControllerTest < Test::Unit::TestCase
-              fixtures :projects, :users, :roles, :members, :enabled_modules, :wikis, :wiki_pages, :wiki_contents, :wiki_content_versions, :attachments
+              fixtures :projects, :users, :roles, :members, :member_roles, :enabled_modules, :wikis, :wiki_pages, :wiki_contents, :wiki_content_versions, :attachments
               def setup
                 @controller = WikiController.new

0

test/functional/wikis_controller_test.rb +1 -1

             class WikisController; def rescue_action(e) raise e end; end
             class WikisControllerTest < Test::Unit::TestCase
-              fixtures :projects, :users, :roles, :members, :enabled_modules, :wikis
+              fixtures :projects, :users, :roles, :members, :member_roles, :enabled_modules, :wikis
               def setup
                 @controller = WikisController.new

0

test/unit/activity_test.rb +1 -1

             require File.dirname(__FILE__) + '/../test_helper'
             class ActivityTest < Test::Unit::TestCase
-              fixtures :projects, :versions, :attachments, :users, :roles, :members, :issues, :journals, :journal_details,
+              fixtures :projects, :versions, :attachments, :users, :roles, :members, :member_roles, :issues, :journals, :journal_details,
                        :trackers, :projects_trackers, :issue_statuses, :enabled_modules, :enumerations, :boards, :messages
               def setup

0

test/unit/changeset_test.rb +1 -1

             require File.dirname(__FILE__) + '/../test_helper'
             class ChangesetTest < Test::Unit::TestCase
-              fixtures :projects, :repositories, :issues, :issue_statuses, :changesets, :changes, :issue_categories, :enumerations, :custom_fields, :custom_values, :users, :members, :trackers
+              fixtures :projects, :repositories, :issues, :issue_statuses, :changesets, :changes, :issue_categories, :enumerations, :custom_fields, :custom_values, :users, :members, :member_roles, :trackers
               def setup
               end

0

test/unit/issue_test.rb +5 -1

             require File.dirname(__FILE__) + '/../test_helper'
             class IssueTest < Test::Unit::TestCase
-              fixtures :projects, :users, :members,
+              fixtures :projects, :users, :members, :member_roles,
                        :trackers, :projects_trackers,
                        :issue_statuses, :issue_categories,
                        :enumerations,
                 assert !Issue.new(:due_date => 1.day.ago.to_date, :status => IssueStatus.find(:first, :conditions => {:is_closed => true})).overdue?
               end
+              def test_assignable_users
+                assert_kind_of User, Issue.find(1).assignable_users.first
+              end
               def test_create_should_send_email_notification
                 ActionMailer::Base.deliveries.clear
                 issue = Issue.new(:project_id => 1, :tracker_id => 1, :author_id => 3, :status_id => 1, :priority => Enumeration.priorities.first, :subject => 'test_create', :estimated_hours => '1:30')

0

test/unit/mail_handler_test.rb +1 0

                                :enabled_modules,
                                :roles,
                                :members,
+                               :member_roles,
                                :issues,
                                :issue_statuses,
                                :workflows,

0

test/unit/mailer_test.rb +1 -1

             class MailerTest < Test::Unit::TestCase
               include Redmine::I18n
-              fixtures :projects, :issues, :users, :members, :documents, :attachments, :news, :tokens, :journals, :journal_details, :changesets, :trackers, :issue_statuses, :enumerations, :messages, :boards, :repositories
+              fixtures :projects, :issues, :users, :members, :member_roles, :documents, :attachments, :news, :tokens, :journals, :journal_details, :changesets, :trackers, :issue_statuses, :enumerations, :messages, :boards, :repositories
               def test_generated_links_in_emails
                 ActionMailer::Base.deliveries.clear

0

test/unit/member_test.rb +29 -9

             require File.dirname(__FILE__) + '/../test_helper'
             class MemberTest < Test::Unit::TestCase
-              fixtures :users, :projects, :roles, :members
+              fixtures :users, :projects, :roles, :members, :member_roles
               def setup
                 @jsmith = Member.find(1)
               end
               def test_create
-                member = Member.new(:project_id => 1, :user_id => 4, :role_id => 1)
+                member = Member.new(:project_id => 1, :user_id => 4, :role_ids => [1, 2])
                 assert member.save
+                member.reload
+                assert_equal 2, member.roles.size
+                assert_equal Role.find(1), member.roles.sort.first
               end
               def test_update
                 assert_equal "eCookbook", @jsmith.project.name
-                assert_equal "Manager", @jsmith.role.name
+                assert_equal "Manager", @jsmith.roles.first.name
                 assert_equal "jsmith", @jsmith.user.login
-                @jsmith.role = Role.find(2)
+                @jsmith.mail_notification = !@jsmith.mail_notification
                 assert @jsmith.save
               end
+              def test_update_roles
+                assert_equal 1, @jsmith.roles.size
+                @jsmith.role_ids = [1, 2]
+                assert @jsmith.save
+                assert_equal 2, @jsmith.reload.roles.size
+              end
               def test_validate
-                member = Member.new(:project_id => 1, :user_id => 2, :role_id =>2)
+                member = Member.new(:project_id => 1, :user_id => 2, :role_ids => [2])
-                # same use can't have more than one role for a project
+                # same use can't have more than one membership for a project
+                assert !member.save
+                member = Member.new(:project_id => 1, :user_id => 2, :role_ids => [])
+                # must have one role at least
                 assert !member.save
               end
               def test_destroy
-                @jsmith.destroy
+                assert_difference 'Member.count', -1 do
+                  assert_difference 'MemberRole.count', -1 do
+                    @jsmith.destroy
+                  end
+                end
                 assert_raise(ActiveRecord::RecordNotFound) { Member.find(@jsmith.id) }
               end
             end

0

test/unit/message_test.rb +3 -3

             require File.dirname(__FILE__) + '/../test_helper'
             class MessageTest < Test::Unit::TestCase
-              fixtures :projects, :roles, :members, :boards, :messages, :users, :watchers
+              fixtures :projects, :roles, :members, :member_roles, :boards, :messages, :users, :watchers
               def setup
                 @board = Board.find(1)
                 author = message.author
                 assert message.editable_by?(author)
-                author.role_for_project(message.project).remove_permission!(:edit_own_messages)
+                author.roles_for_project(message.project).first.remove_permission!(:edit_own_messages)
                 assert !message.reload.editable_by?(author.reload)
               end
                 author = message.author
                 assert message.destroyable_by?(author)
-                author.role_for_project(message.project).remove_permission!(:delete_own_messages)
+                author.roles_for_project(message.project).first.remove_permission!(:delete_own_messages)
                 assert !message.reload.destroyable_by?(author.reload)
               end
             end

0

test/unit/news_test.rb +1 -1

             require File.dirname(__FILE__) + '/../test_helper'
             class NewsTest < Test::Unit::TestCase
-              fixtures :projects, :users, :roles, :members, :enabled_modules, :news
+              fixtures :projects, :users, :roles, :members, :member_roles, :enabled_modules, :news
               def valid_news
                 { :title => 'Test news', :description => 'Lorem ipsum etc', :author => User.find(:first) }

0

test/unit/project_test.rb +2 -2

             class ProjectTest < Test::Unit::TestCase
               fixtures :projects, :enabled_modules,
                        :issues, :issue_statuses, :journals, :journal_details,
-                       :users, :members, :roles, :projects_trackers, :trackers, :boards,
+                       :users, :members, :member_roles, :roles, :projects_trackers, :trackers, :boards,
                        :queries
               def setup
                 @ecookbook = Project.find(1)

0

test/unit/query_test.rb +1 -1

             require File.dirname(__FILE__) + '/../test_helper'
             class QueryTest < Test::Unit::TestCase
-              fixtures :projects, :enabled_modules, :users, :members, :roles, :trackers, :issue_statuses, :issue_categories, :enumerations, :issues, :watchers, :custom_fields, :custom_values, :versions, :queries
+              fixtures :projects, :enabled_modules, :users, :members, :member_roles, :roles, :trackers, :issue_statuses, :issue_categories, :enumerations, :issues, :watchers, :custom_fields, :custom_values, :versions, :queries
               def test_custom_fields_for_all_projects_should_be_available_in_global_queries
                 query = Query.new(:project => nil, :name => '_')

0

test/unit/search_test.rb +2 -1

             class SearchTest < Test::Unit::TestCase
               fixtures :users,
                        :members,
+                       :member_roles,
                        :projects,
                        :roles,
                        :enabled_modules,

0

test/unit/user_test.rb +6 -6

             require File.dirname(__FILE__) + '/../test_helper'
             class UserTest < Test::Unit::TestCase
-              fixtures :users, :members, :projects
+              fixtures :users, :members, :projects, :roles, :member_roles
               def setup
                 @admin = User.find(1)
                 assert_equal key, @jsmith.rss_key
               end
-              def test_role_for_project
+              def test_roles_for_project
                 # user with a role
-                role = @jsmith.role_for_project(Project.find(1))
+                roles = @jsmith.roles_for_project(Project.find(1))
-                assert_kind_of Role, role
+                assert_kind_of Role, roles.first
-                assert_equal "Manager", role.name
+                assert_equal "Manager", roles.first.name
                 # user with no role
-                assert !@dlopper.role_for_project(Project.find(2)).member?
+                assert_nil @dlopper.roles_for_project(Project.find(2)).detect {|role| role.member?}
               end
               def test_mail_notification_all

	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