Fixes user edit urls (#3281).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2698 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index b9e990d6ec4c8adf97c3f2f9bde813a6664c4054..5b8ecaf8cb5dc1150f83190907abb6f7a1882cfb 100644 (file)
--- 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 352c002d0cb3c5cdea509e2b5ea17d0893426541..673f09a7bfafe60ffd4c1657eda25848f10bd2c9 100644 (file)
--- 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 %>