diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2009-05-01 11:25:41 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2009-05-01 11:25:41 +0000 |
| commit | 9fd14713c59f756db8357578bc3c64a94d7c6221 (patch) | |
| tree | 8f0daee55796cfd45fb69bdd5a3c543d36c97419 | |
| parent | d984422a1fc6d68d88161e7f0d35d3d5b9277fe9 (diff) | |
| download | redmine-9fd14713c59f756db8357578bc3c64a94d7c6221.tar.gz redmine-9fd14713c59f756db8357578bc3c64a94d7c6221.zip | |
Fixes user edit urls (#3281).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2698 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/helpers/users_helper.rb | 2 | ||||
| -rw-r--r-- | app/views/users/_general.rhtml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb index b9e990d6e..5b8ecaf8c 100644 --- a/app/helpers/users_helper.rb +++ b/app/helpers/users_helper.rb @@ -34,7 +34,7 @@ module UsersHelper end def change_status_link(user) - url = {:action => 'edit', :id => user, :page => params[:page], :status => params[:status]} + 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' diff --git a/app/views/users/_general.rhtml b/app/views/users/_general.rhtml index 352c002d0..673f09a7b 100644 --- a/app/views/users/_general.rhtml +++ b/app/views/users/_general.rhtml @@ -1,4 +1,4 @@ -<% labelled_tabular_form_for :user, @user, :url => { :action => "edit", :tab => nil } do |f| %> +<% labelled_tabular_form_for :user, @user, :url => { :controller => 'users', :action => "edit", :tab => nil } do |f| %> <%= render :partial => 'form', :locals => { :f => f } %> <%= submit_tag l(:button_save) %> <% end %> |