Mercurial > hg > soundsoftware-site
diff app/helpers/.svn/text-base/users_helper.rb.svn-base @ 514:7eba09d624db live
Merge
author | Chris Cannam |
---|---|
date | Thu, 14 Jul 2011 10:50:53 +0100 |
parents | af80e5618e9b |
children |
line wrap: on
line diff
--- a/app/helpers/.svn/text-base/users_helper.rb.svn-base Thu Jul 14 10:46:20 2011 +0100 +++ b/app/helpers/.svn/text-base/users_helper.rb.svn-base Thu Jul 14 10:50:53 2011 +0100 @@ -33,6 +33,10 @@ options end + def user_mail_notification_options(user) + user.valid_notification_options.collect {|o| [l(o.last), o.first]} + end + def change_status_link(user) url = {:controller => 'users', :action => 'update', :id => user, :page => params[:page], :status => params[:status], :tab => nil}