##// END OF EJS Templates
Backported r9132 from trunk....
Jean-Philippe Lang -
r9029:add23a54b5e2
parent child
Show More
@@ -1,100 +1,103
1 # Redmine - project management software
1 # Redmine - project management software
2 # Copyright (C) 2006-2011 Jean-Philippe Lang
2 # Copyright (C) 2006-2011 Jean-Philippe Lang
3 #
3 #
4 # This program is free software; you can redistribute it and/or
4 # This program is free software; you can redistribute it and/or
5 # modify it under the terms of the GNU General Public License
5 # modify it under the terms of the GNU General Public License
6 # as published by the Free Software Foundation; either version 2
6 # as published by the Free Software Foundation; either version 2
7 # of the License, or (at your option) any later version.
7 # of the License, or (at your option) any later version.
8 #
8 #
9 # This program is distributed in the hope that it will be useful,
9 # This program is distributed in the hope that it will be useful,
10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 # GNU General Public License for more details.
12 # GNU General Public License for more details.
13 #
13 #
14 # You should have received a copy of the GNU General Public License
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
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.
16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17
17
18 class MembersController < ApplicationController
18 class MembersController < ApplicationController
19 model_object Member
19 model_object Member
20 before_filter :find_model_object, :except => [:new, :autocomplete_for_member]
20 before_filter :find_model_object, :except => [:new, :autocomplete_for_member]
21 before_filter :find_project_from_association, :except => [:new, :autocomplete_for_member]
21 before_filter :find_project_from_association, :except => [:new, :autocomplete_for_member]
22 before_filter :find_project, :only => [:new, :autocomplete_for_member]
22 before_filter :find_project, :only => [:new, :autocomplete_for_member]
23 before_filter :authorize
23 before_filter :authorize
24
24
25 def new
25 def new
26 members = []
26 members = []
27 if params[:member] && request.post?
27 if params[:member] && request.post?
28 attrs = params[:member].dup
28 attrs = params[:member].dup
29 if (user_ids = attrs.delete(:user_ids))
29 if (user_ids = attrs.delete(:user_ids))
30 user_ids.each do |user_id|
30 user_ids.each do |user_id|
31 members << Member.new(attrs.merge(:user_id => user_id))
31 members << Member.new(:role_ids => params[:member][:role_ids], :user_id => user_id)
32 end
32 end
33 else
33 else
34 members << Member.new(attrs)
34 members << Member.new(:role_ids => params[:member][:role_ids], :user_id => params[:member][:user_id])
35 end
35 end
36 @project.members << members
36 @project.members << members
37 end
37 end
38 respond_to do |format|
38 respond_to do |format|
39 if members.present? && members.all? {|m| m.valid? }
39 if members.present? && members.all? {|m| m.valid? }
40
40
41 format.html { redirect_to :controller => 'projects', :action => 'settings', :tab => 'members', :id => @project }
41 format.html { redirect_to :controller => 'projects', :action => 'settings', :tab => 'members', :id => @project }
42
42
43 format.js {
43 format.js {
44 render(:update) {|page|
44 render(:update) {|page|
45 page.replace_html "tab-content-members", :partial => 'projects/settings/members'
45 page.replace_html "tab-content-members", :partial => 'projects/settings/members'
46 page << 'hideOnLoad()'
46 page << 'hideOnLoad()'
47 members.each {|member| page.visual_effect(:highlight, "member-#{member.id}") }
47 members.each {|member| page.visual_effect(:highlight, "member-#{member.id}") }
48 }
48 }
49 }
49 }
50 else
50 else
51
51
52 format.js {
52 format.js {
53 render(:update) {|page|
53 render(:update) {|page|
54 errors = members.collect {|m|
54 errors = members.collect {|m|
55 m.errors.full_messages
55 m.errors.full_messages
56 }.flatten.uniq
56 }.flatten.uniq
57
57
58 page.alert(l(:notice_failed_to_save_members, :errors => errors.join(', ')))
58 page.alert(l(:notice_failed_to_save_members, :errors => errors.join(', ')))
59 }
59 }
60 }
60 }
61
61
62 end
62 end
63 end
63 end
64 end
64 end
65
65
66 def edit
66 def edit
67 if request.post? and @member.update_attributes(params[:member])
67 if params[:member]
68 @member.role_ids = params[:member][:role_ids]
69 end
70 if request.post? and @member.save
68 respond_to do |format|
71 respond_to do |format|
69 format.html { redirect_to :controller => 'projects', :action => 'settings', :tab => 'members', :id => @project }
72 format.html { redirect_to :controller => 'projects', :action => 'settings', :tab => 'members', :id => @project }
70 format.js {
73 format.js {
71 render(:update) {|page|
74 render(:update) {|page|
72 page.replace_html "tab-content-members", :partial => 'projects/settings/members'
75 page.replace_html "tab-content-members", :partial => 'projects/settings/members'
73 page << 'hideOnLoad()'
76 page << 'hideOnLoad()'
74 page.visual_effect(:highlight, "member-#{@member.id}")
77 page.visual_effect(:highlight, "member-#{@member.id}")
75 }
78 }
76 }
79 }
77 end
80 end
78 end
81 end
79 end
82 end
80
83
81 def destroy
84 def destroy
82 if request.post? && @member.deletable?
85 if request.post? && @member.deletable?
83 @member.destroy
86 @member.destroy
84 end
87 end
85 respond_to do |format|
88 respond_to do |format|
86 format.html { redirect_to :controller => 'projects', :action => 'settings', :tab => 'members', :id => @project }
89 format.html { redirect_to :controller => 'projects', :action => 'settings', :tab => 'members', :id => @project }
87 format.js { render(:update) {|page|
90 format.js { render(:update) {|page|
88 page.replace_html "tab-content-members", :partial => 'projects/settings/members'
91 page.replace_html "tab-content-members", :partial => 'projects/settings/members'
89 page << 'hideOnLoad()'
92 page << 'hideOnLoad()'
90 }
93 }
91 }
94 }
92 end
95 end
93 end
96 end
94
97
95 def autocomplete_for_member
98 def autocomplete_for_member
96 @principals = Principal.active.like(params[:q]).find(:all, :limit => 100) - @project.principals
99 @principals = Principal.active.like(params[:q]).find(:all, :limit => 100) - @project.principals
97 render :layout => false
100 render :layout => false
98 end
101 end
99
102
100 end
103 end
General Comments 0
You need to be logged in to leave comments. Login now