##// END OF EJS Templates
jro_apps » redmine
RSS
Merged r3934 from trunk....
Eric Davis -
r3870:5345a2dd8979
parent child
Show More
Side by Side Unified
Context file:
r3870:5345a2dd8979 Loading diff...:
Show file before | Show file after | Hide comments
@@ -1,162 +1,170
1 1 # Redmine - project management software
2 2 # Copyright (C) 2006-2009 Jean-Philippe Lang
3 3 #
4 4 # This program is free software; you can redistribute it and/or
5 5 # modify it under the terms of the GNU General Public License
6 6 # as published by the Free Software Foundation; either version 2
7 7 # of the License, or (at your option) any later version.
8 8 #
9 9 # This program is distributed in the hope that it will be useful,
10 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 12 # GNU General Public License for more details.
13 13 #
14 14 # You should have received a copy of the GNU General Public License
15 15 # along with this program; if not, write to the Free Software
16 16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17 17
18 18 class GroupsController < ApplicationController
19 19 layout 'admin'
20 20
21 21 before_filter :require_admin
22 22
23 23 helper :custom_fields
24 24
25 25 # GET /groups
26 26 # GET /groups.xml
27 27 def index
28 28 @groups = Group.find(:all, :order => 'lastname')
29 29
30 30 respond_to do |format|
31 31 format.html # index.html.erb
32 32 format.xml { render :xml => @groups }
33 33 end
34 34 end
35 35
36 36 # GET /groups/1
37 37 # GET /groups/1.xml
38 38 def show
39 39 @group = Group.find(params[:id])
40 40
41 41 respond_to do |format|
42 42 format.html # show.html.erb
43 43 format.xml { render :xml => @group }
44 44 end
45 45 end
46 46
47 47 # GET /groups/new
48 48 # GET /groups/new.xml
49 49 def new
50 50 @group = Group.new
51 51
52 52 respond_to do |format|
53 53 format.html # new.html.erb
54 54 format.xml { render :xml => @group }
55 55 end
56 56 end
57 57
58 58 # GET /groups/1/edit
59 59 def edit
60 60 @group = Group.find(params[:id], :include => :projects)
61 61 end
62 62
63 63 # POST /groups
64 64 # POST /groups.xml
65 65 def create
66 66 @group = Group.new(params[:group])
67 67
68 68 respond_to do |format|
69 69 if @group.save
70 70 flash[:notice] = l(:notice_successful_create)
71 71 format.html { redirect_to(groups_path) }
72 72 format.xml { render :xml => @group, :status => :created, :location => @group }
73 73 else
74 74 format.html { render :action => "new" }
75 75 format.xml { render :xml => @group.errors, :status => :unprocessable_entity }
76 76 end
77 77 end
78 78 end
79 79
80 80 # PUT /groups/1
81 81 # PUT /groups/1.xml
82 82 def update
83 83 @group = Group.find(params[:id])
84 84
85 85 respond_to do |format|
86 86 if @group.update_attributes(params[:group])
87 87 flash[:notice] = l(:notice_successful_update)
88 88 format.html { redirect_to(groups_path) }
89 89 format.xml { head :ok }
90 90 else
91 91 format.html { render :action => "edit" }
92 92 format.xml { render :xml => @group.errors, :status => :unprocessable_entity }
93 93 end
94 94 end
95 95 end
96 96
97 97 # DELETE /groups/1
98 98 # DELETE /groups/1.xml
99 99 def destroy
100 100 @group = Group.find(params[:id])
101 101 @group.destroy
102 102
103 103 respond_to do |format|
104 104 format.html { redirect_to(groups_url) }
105 105 format.xml { head :ok }
106 106 end
107 107 end
108 108
109 109 def add_users
110 110 @group = Group.find(params[:id])
111 111 users = User.find_all_by_id(params[:user_ids])
112 112 @group.users << users if request.post?
113 113 respond_to do |format|
114 114 format.html { redirect_to :controller => 'groups', :action => 'edit', :id => @group, :tab => 'users' }
115 115 format.js {
116 116 render(:update) {|page|
117 117 page.replace_html "tab-content-users", :partial => 'groups/users'
118 118 users.each {|user| page.visual_effect(:highlight, "user-#{user.id}") }
119 119 }
120 120 }
121 121 end
122 122 end
123 123
124 124 def remove_user
125 125 @group = Group.find(params[:id])
126 126 @group.users.delete(User.find(params[:user_id])) if request.post?
127 127 respond_to do |format|
128 128 format.html { redirect_to :controller => 'groups', :action => 'edit', :id => @group, :tab => 'users' }
129 129 format.js { render(:update) {|page| page.replace_html "tab-content-users", :partial => 'groups/users'} }
130 130 end
131 131 end
132 132
133 133 def autocomplete_for_user
134 134 @group = Group.find(params[:id])
135 135 @users = User.active.like(params[:q]).find(:all, :limit => 100) - @group.users
136 136 render :layout => false
137 137 end
138 138
139 139 def edit_membership
140 140 @group = Group.find(params[:id])
141 141 @membership = Member.edit_membership(params[:membership_id], params[:membership], @group)
142 142 @membership.save if request.post?
143 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
144 if @membership.valid?
145 format.html { redirect_to :controller => 'groups', :action => 'edit', :id => @group, :tab => 'memberships' }
146 format.js {
147 render(:update) {|page|
148 page.replace_html "tab-content-memberships", :partial => 'groups/memberships'
149 page.visual_effect(:highlight, "member-#{@membership.id}")
150 }
151 }
152 else
153 format.js {
154 render(:update) {|page|
155 page.alert(l(:notice_failed_to_save_members, :errors => @membership.errors.full_messages.join(', ')))
156 }
157 }
158 end
159 end
152 160 end
153 161
154 162 def destroy_membership
155 163 @group = Group.find(params[:id])
156 164 Member.find(params[:membership_id]).destroy if request.post?
157 165 respond_to do |format|
158 166 format.html { redirect_to :controller => 'groups', :action => 'edit', :id => @group, :tab => 'memberships' }
159 167 format.js { render(:update) {|page| page.replace_html "tab-content-memberships", :partial => 'groups/memberships'} }
160 168 end
161 169 end
162 170 end
Show file before | Show file after | Hide comments
@@ -1,147 +1,155
1 1 # Redmine - project management software
2 2 # Copyright (C) 2006-2009 Jean-Philippe Lang
3 3 #
4 4 # This program is free software; you can redistribute it and/or
5 5 # modify it under the terms of the GNU General Public License
6 6 # as published by the Free Software Foundation; either version 2
7 7 # of the License, or (at your option) any later version.
8 8 #
9 9 # This program is distributed in the hope that it will be useful,
10 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 12 # GNU General Public License for more details.
13 13 #
14 14 # You should have received a copy of the GNU General Public License
15 15 # along with this program; if not, write to the Free Software
16 16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17 17
18 18 class UsersController < ApplicationController
19 19 layout 'admin'
20 20
21 21 before_filter :require_admin, :except => :show
22 22
23 23 helper :sort
24 24 include SortHelper
25 25 helper :custom_fields
26 26 include CustomFieldsHelper
27 27
28 28 def index
29 29 sort_init 'login', 'asc'
30 30 sort_update %w(login firstname lastname mail admin created_on last_login_on)
31 31
32 32 @status = params[:status] ? params[:status].to_i : 1
33 33 c = ARCondition.new(@status == 0 ? "status <> 0" : ["status = ?", @status])
34 34
35 35 unless params[:name].blank?
36 36 name = "%#{params[:name].strip.downcase}%"
37 37 c << ["LOWER(login) LIKE ? OR LOWER(firstname) LIKE ? OR LOWER(lastname) LIKE ? OR LOWER(mail) LIKE ?", name, name, name, name]
38 38 end
39 39
40 40 @user_count = User.count(:conditions => c.conditions)
41 41 @user_pages = Paginator.new self, @user_count,
42 42 per_page_option,
43 43 params['page']
44 44 @users = User.find :all,:order => sort_clause,
45 45 :conditions => c.conditions,
46 46 :limit => @user_pages.items_per_page,
47 47 :offset => @user_pages.current.offset
48 48
49 49 render :layout => !request.xhr?
50 50 end
51 51
52 52 def show
53 53 @user = User.find(params[:id])
54 54 @custom_values = @user.custom_values
55 55
56 56 # show only public projects and private projects that the logged in user is also a member of
57 57 @memberships = @user.memberships.select do |membership|
58 58 membership.project.is_public? || (User.current.member_of?(membership.project))
59 59 end
60 60
61 61 events = Redmine::Activity::Fetcher.new(User.current, :author => @user).events(nil, nil, :limit => 10)
62 62 @events_by_day = events.group_by(&:event_date)
63 63
64 64 unless User.current.admin?
65 65 if !@user.active? || (@user != User.current && @memberships.empty? && events.empty?)
66 66 render_404
67 67 return
68 68 end
69 69 end
70 70 render :layout => 'base'
71 71
72 72 rescue ActiveRecord::RecordNotFound
73 73 render_404
74 74 end
75 75
76 76 def add
77 77 if request.get?
78 78 @user = User.new(:language => Setting.default_language)
79 79 else
80 80 @user = User.new(params[:user])
81 81 @user.admin = params[:user][:admin] || false
82 82 @user.login = params[:user][:login]
83 83 @user.password, @user.password_confirmation = params[:password], params[:password_confirmation] unless @user.auth_source_id
84 84 if @user.save
85 85 Mailer.deliver_account_information(@user, params[:password]) if params[:send_information]
86 86 flash[:notice] = l(:notice_successful_create)
87 87 redirect_to(params[:continue] ? {:controller => 'users', :action => 'add'} :
88 88 {:controller => 'users', :action => 'edit', :id => @user})
89 89 return
90 90 end
91 91 end
92 92 @auth_sources = AuthSource.find(:all)
93 93 end
94 94
95 95 def edit
96 96 @user = User.find(params[:id])
97 97 if request.post?
98 98 @user.admin = params[:user][:admin] if params[:user][:admin]
99 99 @user.login = params[:user][:login] if params[:user][:login]
100 100 @user.password, @user.password_confirmation = params[:password], params[:password_confirmation] unless params[:password].nil? or params[:password].empty? or @user.auth_source_id
101 101 @user.group_ids = params[:user][:group_ids] if params[:user][:group_ids]
102 102 @user.attributes = params[:user]
103 103 # Was the account actived ? (do it before User#save clears the change)
104 104 was_activated = (@user.status_change == [User::STATUS_REGISTERED, User::STATUS_ACTIVE])
105 105 if @user.save
106 106 if was_activated
107 107 Mailer.deliver_account_activated(@user)
108 108 elsif @user.active? && params[:send_information] && !params[:password].blank? && @user.auth_source_id.nil?
109 109 Mailer.deliver_account_information(@user, params[:password])
110 110 end
111 111 flash[:notice] = l(:notice_successful_update)
112 112 redirect_to :back
113 113 end
114 114 end
115 115 @auth_sources = AuthSource.find(:all)
116 116 @membership ||= Member.new
117 117 rescue ::ActionController::RedirectBackError
118 118 redirect_to :controller => 'users', :action => 'edit', :id => @user
119 119 end
120 120
121 121 def edit_membership
122 122 @user = User.find(params[:id])
123 123 @membership = Member.edit_membership(params[:membership_id], params[:membership], @user)
124 124 @membership.save if request.post?
125 125 respond_to do |format|
126 format.html { redirect_to :controller => 'users', :action => 'edit', :id => @user, :tab => 'memberships' }
127 format.js {
128 render(:update) {|page|
129 page.replace_html "tab-content-memberships", :partial => 'users/memberships'
130 page.visual_effect(:highlight, "member-#{@membership.id}")
131 }
132 }
133 end
126 if @membership.valid?
127 format.html { redirect_to :controller => 'users', :action => 'edit', :id => @user, :tab => 'memberships' }
128 format.js {
129 render(:update) {|page|
130 page.replace_html "tab-content-memberships", :partial => 'users/memberships'
131 page.visual_effect(:highlight, "member-#{@membership.id}")
132 }
133 }
134 else
135 format.js {
136 render(:update) {|page|
137 page.alert(l(:notice_failed_to_save_members, :errors => @membership.errors.full_messages.join(', ')))
138 }
139 }
140 end
141 end
134 142 end
135 143
136 144 def destroy_membership
137 145 @user = User.find(params[:id])
138 146 @membership = Member.find(params[:membership_id])
139 147 if request.post? && @membership.deletable?
140 148 @membership.destroy
141 149 end
142 150 respond_to do |format|
143 151 format.html { redirect_to :controller => 'users', :action => 'edit', :id => @user, :tab => 'memberships' }
144 152 format.js { render(:update) {|page| page.replace_html "tab-content-memberships", :partial => 'users/memberships'} }
145 153 end
146 154 end
147 155 end
General Comments 0
You need to be logged in to leave comments. Login now