| @@ -25,6 +25,9 class UserPreference < ActiveRecord::Base | |||
|
|
25 | 25 | |
|
|
26 | 26 | def initialize(attributes=nil, *args) |
|
|
27 | 27 | super |
|
|
28 | if new_record? && !(attributes && attributes.key?(:hide_mail)) | |
|
|
29 | self.hide_mail = Setting.default_users_hide_mail? | |
|
|
30 | end | |
|
|
28 | 31 | self.others ||= {} |
|
|
29 | 32 | end |
|
|
30 | 33 | |
| @@ -36,5 +36,13 | |||
|
|
36 | 36 | <p><em class="info"><%= l(:text_session_expiration_settings) %></em></p> |
|
|
37 | 37 | </fieldset> |
|
|
38 | 38 | |
|
|
39 | <fieldset class="box"> | |
|
|
40 | <legend><%= l(:label_default_values_for_new_users) %></legend> | |
|
|
41 | ||
|
|
42 | <div class="tabular settings"> | |
|
|
43 | <p><%= setting_check_box :default_users_hide_mail, :label => :field_hide_mail %></p> | |
|
|
44 | </div> | |
|
|
45 | </fieldset> | |
|
|
46 | ||
|
|
39 | 47 | <%= submit_tag l(:button_save) %> |
|
|
40 | 48 | <% end %> |
| @@ -975,6 +975,7 en: | |||
|
|
975 | 975 | label_create_missing_values: Create missing values |
|
|
976 | 976 | label_api: API |
|
|
977 | 977 | label_field_format_enumeration: Key/value list |
|
|
978 | label_default_values_for_new_users: Default values for new users | |
|
|
978 | 979 | |
|
|
979 | 980 | button_login: Login |
|
|
980 | 981 | button_submit: Submit |
| @@ -993,6 +993,7 fr: | |||
|
|
993 | 993 | label_create_missing_values: Créer les valeurs manquantes |
|
|
994 | 994 | label_api: API |
|
|
995 | 995 | label_field_format_enumeration: Liste clé/valeur |
|
|
996 | label_default_values_for_new_users: Valeurs par défaut pour les nouveaux utilisateurs | |
|
|
996 | 997 | |
|
|
997 | 998 | button_login: Connexion |
|
|
998 | 999 | button_submit: Soumettre |
| @@ -217,6 +217,8 sequential_project_identifiers: | |||
|
|
217 | 217 | default: 0 |
|
|
218 | 218 | # encodings used to convert repository files content to UTF-8 |
|
|
219 | 219 | # multiple values accepted, comma separated |
|
|
220 | default_users_hide_mail: | |
|
|
221 | default: 1 | |
|
|
220 | 222 | repositories_encodings: |
|
|
221 | 223 | default: '' |
|
|
222 | 224 | # encoding used to convert commit logs to UTF-8 |
| @@ -25,6 +25,13 class UserPreferenceTest < ActiveSupport::TestCase | |||
|
|
25 | 25 | assert_equal true, preference.hide_mail |
|
|
26 | 26 | end |
|
|
27 | 27 | |
|
|
28 | def test_hide_mail_should_default_to_false_with_setting | |
|
|
29 | with_settings :default_users_hide_mail => '0' do | |
|
|
30 | preference = UserPreference.new | |
|
|
31 | assert_equal false, preference.hide_mail | |
|
|
32 | end | |
|
|
33 | end | |
|
|
34 | ||
|
|
28 | 35 | def test_create |
|
|
29 | 36 | user = User.new(:firstname => "new", :lastname => "user", :mail => "newuser@somenet.foo") |
|
|
30 | 37 | user.login = "newuser" |
General Comments 0
You need to be logged in to leave comments.
Login now