Bläddra i källkod

Selected projects in email notifications on "my account" are lost when the page is redisplayed after a validation error (#18060).

Patch by Felix Schäfer.

git-svn-id: http://svn.redmine.org/redmine/trunk@13638 e93f8b46-1217-0410-a6f0-8f06a7374b81
tags/3.0.0
Jean-Philippe Lang 9 år sedan
förälder
incheckning
827ab38725
2 ändrade filer med 6 tillägg och 1 borttagningar
  1. 1
    1
      app/models/user.rb
  2. 5
    0
      test/unit/user_test.rb

+ 1
- 1
app/models/user.rb Visa fil

@@ -368,7 +368,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)

+ 5
- 0
test/unit/user_test.rb Visa fil

@@ -948,6 +948,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 = []

Laddar…
Avbryt
Spara