jro_apps/redmine Commit - r4651:27a319e66d43

Merged r4727 and r4730 from trunk....

Jean-Philippe Lang -

r4651:27a319e66d43

parent child

Context file:

r4651:27a319e66d43

app/models/user.rb +7 -3

                  notified_projects_ids
                end
-               # Only users that belong to more than 1 project can select projects for which they are notified
                def valid_notification_options
+                 self.class.valid_notification_options(self)
+               end
+               # Only users that belong to more than 1 project can select projects for which they are notified
+               def self.valid_notification_options(user=nil)
                  # Note that @user.membership.size would fail since AR ignores
                  # :include association option when doing a count
-                 if memberships.length < 1
-                   MAIL_NOTIFICATION_OPTIONS.delete_if {|option| option.first == 'selected'}
+                 if user.nil? || user.memberships.length < 1
+                   MAIL_NOTIFICATION_OPTIONS.reject {|option| option.first == 'selected'}
                  else
                    MAIL_NOTIFICATION_OPTIONS
                  end

app/views/settings/_notifications.rhtml +1 -1

              <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>

test/unit/user_test.rb +15 -2

-             # redMine - project management software
-             # Copyright (C) 2006  Jean-Philippe Lang
+             # Redmine - project management software
+             # Copyright (C) 2006-2011  Jean-Philippe Lang
              #
              # This program is free software; you can redistribute it and/or
              # modify it under the terms of the GNU General Public License
                  assert_nil @dlopper.roles_for_project(Project.find(2)).detect {|role| role.member?}
                end
+               def test_valid_notification_options
+                 # without memberships
+                 assert_equal 5, User.find(7).valid_notification_options.size
+                 # with memberships
+                 assert_equal 6, User.find(2).valid_notification_options.size
+               end
+               def test_valid_notification_options_class_method
+                 assert_equal 5, User.valid_notification_options.size
+                 assert_equal 5, User.valid_notification_options(User.find(7)).size
+                 assert_equal 6, User.valid_notification_options(User.find(2)).size
+               end
                def test_mail_notification_all
                  @jsmith.mail_notification = 'all'
                  @jsmith.notified_project_ids = []

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages