comparison app/helpers/.svn/text-base/users_helper.rb.svn-base @ 117:af80e5618e9b redmine-1.1

* Update to Redmine 1.1-stable branch (Redmine SVN rev 4707)
author Chris Cannam
date Thu, 13 Jan 2011 12:53:21 +0000
parents 94944d00e43c
children
comparison
equal deleted inserted replaced
39:150ceac17a8d 117:af80e5618e9b
31 {:disabled => (user.projects.include?(p))} 31 {:disabled => (user.projects.include?(p))}
32 end 32 end
33 options 33 options
34 end 34 end
35 35
36 def user_mail_notification_options(user)
37 user.valid_notification_options.collect {|o| [l(o.last), o.first]}
38 end
39
36 def change_status_link(user) 40 def change_status_link(user)
37 url = {:controller => 'users', :action => 'update', :id => user, :page => params[:page], :status => params[:status], :tab => nil} 41 url = {:controller => 'users', :action => 'update', :id => user, :page => params[:page], :status => params[:status], :tab => nil}
38 42
39 if user.locked? 43 if user.locked?
40 link_to l(:button_unlock), url.merge(:user => {:status => User::STATUS_ACTIVE}), :method => :put, :class => 'icon icon-unlock' 44 link_to l(:button_unlock), url.merge(:user => {:status => User::STATUS_ACTIVE}), :method => :put, :class => 'icon icon-unlock'