##// END OF EJS Templates
Fixes user edit urls (#3281)....
Jean-Philippe Lang -
r2606:9fd14713c59f
parent child
Show More
@@ -1,53 +1,53
1 1 # redMine - project management software
2 2 # Copyright (C) 2006 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 module UsersHelper
19 19 def users_status_options_for_select(selected)
20 20 user_count_by_status = User.count(:group => 'status').to_hash
21 21 options_for_select([[l(:label_all), ''],
22 22 ["#{l(:status_active)} (#{user_count_by_status[1].to_i})", 1],
23 23 ["#{l(:status_registered)} (#{user_count_by_status[2].to_i})", 2],
24 24 ["#{l(:status_locked)} (#{user_count_by_status[3].to_i})", 3]], selected)
25 25 end
26 26
27 27 # Options for the new membership projects combo-box
28 28 def options_for_membership_project_select(user, projects)
29 29 options = content_tag('option', "--- #{l(:actionview_instancetag_blank_option)} ---")
30 30 options << project_tree_options_for_select(projects) do |p|
31 31 {:disabled => (user.projects.include?(p))}
32 32 end
33 33 options
34 34 end
35 35
36 36 def change_status_link(user)
37 url = {:action => 'edit', :id => user, :page => params[:page], :status => params[:status]}
37 url = {:controller => 'users', :action => 'edit', :id => user, :page => params[:page], :status => params[:status], :tab => nil}
38 38
39 39 if user.locked?
40 40 link_to l(:button_unlock), url.merge(:user => {:status => User::STATUS_ACTIVE}), :method => :post, :class => 'icon icon-unlock'
41 41 elsif user.registered?
42 42 link_to l(:button_activate), url.merge(:user => {:status => User::STATUS_ACTIVE}), :method => :post, :class => 'icon icon-unlock'
43 43 elsif user != User.current
44 44 link_to l(:button_lock), url.merge(:user => {:status => User::STATUS_LOCKED}), :method => :post, :class => 'icon icon-lock'
45 45 end
46 46 end
47 47
48 48 def user_settings_tabs
49 49 tabs = [{:name => 'general', :partial => 'users/general', :label => :label_general},
50 50 {:name => 'memberships', :partial => 'users/memberships', :label => :label_project_plural}
51 51 ]
52 52 end
53 53 end
@@ -1,4 +1,4
1 <% labelled_tabular_form_for :user, @user, :url => { :action => "edit", :tab => nil } do |f| %>
1 <% labelled_tabular_form_for :user, @user, :url => { :controller => 'users', :action => "edit", :tab => nil } do |f| %>
2 2 <%= render :partial => 'form', :locals => { :f => f } %>
3 3 <%= submit_tag l(:button_save) %>
4 4 <% end %>
General Comments 0
You need to be logged in to leave comments. Login now