@@ -28,6 +28,9 class UserPreference < ActiveRecord::Base | |||
|
28 | 28 | if new_record? && !(attributes && attributes.key?(:hide_mail)) |
|
29 | 29 | self.hide_mail = Setting.default_users_hide_mail? |
|
30 | 30 | end |
|
31 | if new_record? && !(attributes && attributes.key?(:no_self_notified)) | |
|
32 | self.no_self_notified = true | |
|
33 | end | |
|
31 | 34 | self.others ||= {} |
|
32 | 35 | end |
|
33 | 36 |
@@ -2,6 +2,7 | |||
|
2 | 2 | user_preferences_001: |
|
3 | 3 | others: | |
|
4 | 4 | --- |
|
5 | :no_self_notified: false | |
|
5 | 6 | :my_page_layout: |
|
6 | 7 | left: |
|
7 | 8 | - latestnews |
@@ -17,6 +18,15 user_preferences_001: | |||
|
17 | 18 | user_preferences_002: |
|
18 | 19 | others: | |
|
19 | 20 | --- |
|
21 | :no_self_notified: false | |
|
22 | ||
|
23 | id: 2 | |
|
24 | user_id: 2 | |
|
25 | hide_mail: true | |
|
26 | user_preferences_003: | |
|
27 | others: | | |
|
28 | --- | |
|
29 | :no_self_notified: false | |
|
20 | 30 | :my_page_layout: |
|
21 | 31 | left: |
|
22 | 32 | - latestnews |
@@ -26,6 +36,6 user_preferences_002: | |||
|
26 | 36 | top: |
|
27 | 37 | - calendar |
|
28 | 38 | |
|
29 |
id: |
|
|
39 | id: 3 | |
|
30 | 40 | user_id: 3 |
|
31 | 41 | hide_mail: false |
@@ -19,7 +19,7 require File.expand_path('../../test_helper', __FILE__) | |||
|
19 | 19 | |
|
20 | 20 | class IssuesControllerTest < ActionController::TestCase |
|
21 | 21 | fixtures :projects, |
|
22 | :users, :email_addresses, | |
|
22 | :users, :email_addresses, :user_preferences, | |
|
23 | 23 | :roles, |
|
24 | 24 | :members, |
|
25 | 25 | :member_roles, |
@@ -20,7 +20,7 require File.expand_path('../../test_helper', __FILE__) | |||
|
20 | 20 | class IssuesCustomFieldsVisibilityTest < ActionController::TestCase |
|
21 | 21 | tests IssuesController |
|
22 | 22 | fixtures :projects, |
|
23 | :users, :email_addresses, | |
|
23 | :users, :email_addresses, :user_preferences, | |
|
24 | 24 | :roles, |
|
25 | 25 | :members, |
|
26 | 26 | :member_roles, |
@@ -18,7 +18,7 | |||
|
18 | 18 | require File.expand_path('../../test_helper', __FILE__) |
|
19 | 19 | |
|
20 | 20 | class MessagesControllerTest < ActionController::TestCase |
|
21 | fixtures :projects, :users, :email_addresses, :members, :member_roles, :roles, :boards, :messages, :enabled_modules | |
|
21 | fixtures :projects, :users, :email_addresses, :user_preferences, :members, :member_roles, :roles, :boards, :messages, :enabled_modules | |
|
22 | 22 | |
|
23 | 23 | def setup |
|
24 | 24 | User.current = nil |
@@ -18,7 +18,7 | |||
|
18 | 18 | require File.expand_path('../../test_helper', __FILE__) |
|
19 | 19 | |
|
20 | 20 | class IssueTest < ActiveSupport::TestCase |
|
21 | fixtures :projects, :users, :email_addresses, :members, :member_roles, :roles, | |
|
21 | fixtures :projects, :users, :email_addresses, :user_preferences, :members, :member_roles, :roles, | |
|
22 | 22 | :groups_users, |
|
23 | 23 | :trackers, :projects_trackers, |
|
24 | 24 | :enabled_modules, |
@@ -22,7 +22,7 require File.expand_path('../../test_helper', __FILE__) | |||
|
22 | 22 | class MailHandlerTest < ActiveSupport::TestCase |
|
23 | 23 | fixtures :users, :projects, :enabled_modules, :roles, |
|
24 | 24 | :members, :member_roles, :users, |
|
25 | :email_addresses, | |
|
25 | :email_addresses, :user_preferences, | |
|
26 | 26 | :issues, :issue_statuses, |
|
27 | 27 | :workflows, :trackers, :projects_trackers, |
|
28 | 28 | :versions, :enumerations, :issue_categories, |
@@ -32,6 +32,11 class UserPreferenceTest < ActiveSupport::TestCase | |||
|
32 | 32 | end |
|
33 | 33 | end |
|
34 | 34 | |
|
35 | def test_no_self_notified_should_default_to_true | |
|
36 | preference = UserPreference.new | |
|
37 | assert_equal true, preference.no_self_notified | |
|
38 | end | |
|
39 | ||
|
35 | 40 | def test_create |
|
36 | 41 | user = User.new(:firstname => "new", :lastname => "user", :mail => "newuser@somenet.foo") |
|
37 | 42 | user.login = "newuser" |
@@ -67,11 +72,6 class UserPreferenceTest < ActiveSupport::TestCase | |||
|
67 | 72 | assert_kind_of Hash, up.others |
|
68 | 73 | end |
|
69 | 74 | |
|
70 | def test_others_should_be_blank_after_initialization | |
|
71 | pref = User.new.pref | |
|
72 | assert_equal({}, pref.others) | |
|
73 | end | |
|
74 | ||
|
75 | 75 | def test_reading_value_from_nil_others_hash |
|
76 | 76 | up = UserPreference.new(:user => User.new) |
|
77 | 77 | up.others = nil |
General Comments 0
You need to be logged in to leave comments.
Login now