Преглед на файлове

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

git-svn-id: http://svn.redmine.org/redmine/trunk@14974 e93f8b46-1217-0410-a6f0-8f06a7374b81
tags/3.3.0
Jean-Philippe Lang преди 8 години
родител
ревизия
ad8a529c8d
променени са 6 файла, в които са добавени 22 реда и са изтрити 0 реда
  1. 3
    0
      app/models/user_preference.rb
  2. 8
    0
      app/views/settings/_authentication.html.erb
  3. 1
    0
      config/locales/en.yml
  4. 1
    0
      config/locales/fr.yml
  5. 2
    0
      config/settings.yml
  6. 7
    0
      test/unit/user_preference_test.rb

+ 3
- 0
app/models/user_preference.rb Целия файл

@@ -25,6 +25,9 @@ class UserPreference < ActiveRecord::Base

def initialize(attributes=nil, *args)
super
if new_record? && !(attributes && attributes.key?(:hide_mail))
self.hide_mail = Setting.default_users_hide_mail?
end
self.others ||= {}
end


+ 8
- 0
app/views/settings/_authentication.html.erb Целия файл

@@ -36,5 +36,13 @@
<p><em class="info"><%= l(:text_session_expiration_settings) %></em></p>
</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) %>
<% end %>

+ 1
- 0
config/locales/en.yml Целия файл

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

button_login: Login
button_submit: Submit

+ 1
- 0
config/locales/fr.yml Целия файл

@@ -993,6 +993,7 @@ fr:
label_create_missing_values: Créer les valeurs manquantes
label_api: API
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_submit: Soumettre

+ 2
- 0
config/settings.yml Целия файл

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

+ 7
- 0
test/unit/user_preference_test.rb Целия файл

@@ -25,6 +25,13 @@ class UserPreferenceTest < ActiveSupport::TestCase
assert_equal true, preference.hide_mail
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
user = User.new(:firstname => "new", :lastname => "user", :mail => "newuser@somenet.foo")
user.login = "newuser"

Loading…
Отказ
Запис