git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2698 e93f8b46-1217-0410-a6f0-8f06a7374b81tags/0.9.0
@@ -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' |
@@ -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 %> |