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