Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-12-16 05:20:28 +01:00
Code Issues Packages Projects Releases Activity

Option to show email adresses by default for new users (#21447).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@14974 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2015-12-13 15:21:48 +00:00
parent 46e1c6a2fe
commit ad8a529c8d
6 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/user_preference.rb
View File

@@ -25,6 +25,9 @@ class UserPreference < ActiveRecord::Base
def initialize(attributes=nil, *args) def initialize(attributes=nil, *args)
super super
if new_record? && !(attributes && attributes.key?(:hide_mail))
self.hide_mail = Setting.default_users_hide_mail?
end
self.others ||= {} self.others ||= {}
end end

8
app/views/settings/_authentication.html.erb
View File

@@ -36,5 +36,13 @@
<p><em class="info"><%= l(:text_session_expiration_settings) %></em></p> <p><em class="info"><%= l(:text_session_expiration_settings) %></em></p>
</fieldset> </fieldset>
<fieldset class="box">
<legend><%= l(:label_default_values_for_new_users) %></legend>
<div class="tabular settings">
<p><%= setting_check_box :default_users_hide_mail, :label => :field_hide_mail %></p>
</div>
</fieldset>
<%= submit_tag l(:button_save) %> <%= submit_tag l(:button_save) %>
<% end %> <% end %>

1
config/locales/en.yml
View File

@@ -975,6 +975,7 @@ en:
label_create_missing_values: Create missing values label_create_missing_values: Create missing values
label_api: API label_api: API
label_field_format_enumeration: Key/value list label_field_format_enumeration: Key/value list
label_default_values_for_new_users: Default values for new users
button_login: Login button_login: Login
button_submit: Submit button_submit: Submit

1
config/locales/fr.yml
View File

@@ -993,6 +993,7 @@ fr:
label_create_missing_values: Créer les valeurs manquantes label_create_missing_values: Créer les valeurs manquantes
label_api: API label_api: API
label_field_format_enumeration: Liste clé/valeur label_field_format_enumeration: Liste clé/valeur
label_default_values_for_new_users: Valeurs par défaut pour les nouveaux utilisateurs
button_login: Connexion button_login: Connexion
button_submit: Soumettre button_submit: Soumettre

2
config/settings.yml
View File

@@ -217,6 +217,8 @@ sequential_project_identifiers:
default: 0 default: 0
# encodings used to convert repository files content to UTF-8 # encodings used to convert repository files content to UTF-8
# multiple values accepted, comma separated # multiple values accepted, comma separated
default_users_hide_mail:
default: 1
repositories_encodings: repositories_encodings:
default: '' default: ''
# encoding used to convert commit logs to UTF-8 # encoding used to convert commit logs to UTF-8

7
test/unit/user_preference_test.rb
View File

@@ -25,6 +25,13 @@ class UserPreferenceTest < ActiveSupport::TestCase
assert_equal true, preference.hide_mail assert_equal true, preference.hide_mail
end end
def test_hide_mail_should_default_to_false_with_setting
with_settings :default_users_hide_mail => '0' do
preference = UserPreference.new
assert_equal false, preference.hide_mail
end
end
def test_create def test_create
user = User.new(:firstname => "new", :lastname => "user", :mail => "newuser@somenet.foo") user = User.new(:firstname => "new", :lastname => "user", :mail => "newuser@somenet.foo")
user.login = "newuser" user.login = "newuser"