Merged r13638 (#18060).

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13642 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2014-11-23 08:44:39 +00:00
parent 6ddae89aff
commit 548e316898
2 changed files with 6 additions and 1 deletions

View File

@@ -354,7 +354,7 @@ class User < Principal
def notified_project_ids=(ids)
@notified_projects_ids_changed = true
@notified_projects_ids = ids
@notified_projects_ids = ids.map(&:to_i).uniq.select {|n| n > 0}
end
# Updates per project notifications (after_save callback)

View File

@@ -913,6 +913,11 @@ class UserTest < ActiveSupport::TestCase
assert_equal 6, User.valid_notification_options(User.find(2)).size
end
def test_notified_project_ids_setter_should_coerce_to_unique_integer_array
@jsmith.notified_project_ids = ["1", "123", "2u", "wrong", "12", 6, 12, -35, ""]
assert_equal [1, 123, 2, 12, 6], @jsmith.notified_projects_ids
end
def test_mail_notification_all
@jsmith.mail_notification = 'all'
@jsmith.notified_project_ids = []