Merged r4727 and r4730 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.1-stable@4771 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-01-30 06:10:36 +00:00
parent 7be5bf6e4d
commit 27a319e66d
3 changed files with 23 additions and 6 deletions
@@ -8,7 +8,7 @@

 <p><%= setting_check_box :plain_text_mail %></p>

-<p><%= setting_select(:default_notification_option, User::MAIL_NOTIFICATION_OPTIONS.collect {|o| [l(o.last), o.first.to_s]}) %></p>
+<p><%= setting_select(:default_notification_option, User.valid_notification_options.collect {|o| [l(o.last), o.first.to_s]}) %></p>

 </div>