diff app/helpers/users_helper.rb @ 523:0b6c82dead28 luisf

Merge from branch "cannam"
author luisf <luis.figueira@eecs.qmul.ac.uk>
date Mon, 25 Jul 2011 14:23:37 +0100
parents af80e5618e9b
children cbb26bc654de
line wrap: on
line diff
--- a/app/helpers/users_helper.rb	Mon Mar 28 18:17:06 2011 +0100
+++ b/app/helpers/users_helper.rb	Mon Jul 25 14:23:37 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}