0001-Introduce-setting-to-hide-optional-user-custom-field.patch

Jan from Planio www.plan.io, 2016-10-17 17:20

Download (3.84 KB)

View differences:

app/views/account/register.html.erb
29 29
  <p><%= f.text_field :identity_url  %></p>
30 30
<% end %>
31 31

  
32
<% @user.custom_field_values.select {|v| v.editable? || v.required?}.each do |value| %>
32
<% @user.custom_field_values.select {|v| (Setting.show_custom_fields_on_registration? && v.editable?) || v.required?}.each do |value| %>
33 33
  <p><%= custom_field_tag_with_label :user, value %></p>
34 34
<% end %>
35 35
</div>
app/views/settings/_authentication.html.erb
8 8
<p><%= setting_select :self_registration, [[l(:label_disabled), "0"],
9 9
                                           [l(:label_registration_activation_by_email), "1"],
10 10
                                           [l(:label_registration_manual_activation), "2"],
11
                                           [l(:label_registration_automatic_activation), "3"]] %></p>
11
                                           [l(:label_registration_automatic_activation), "3"]],
12
                      :onchange =>
13
                          "if (this.value != '0') { $('#settings_show_custom_fields_on_registration').removeAttr('disabled'); } else { $('#settings_show_custom_fields_on_registration').attr('disabled', true); }" %></p>
14

  
15
<p><%= setting_check_box :show_custom_fields_on_registration,
16
                         :disabled => !Setting.self_registration? %></p>
12 17

  
13 18
<p><%= setting_check_box :unsubscribe %></p>
14 19

  
config/locales/de.yml
1038 1038
  setting_repository_log_display_limit: Maximale Anzahl anzuzeigender Revisionen in der Historie einer Datei
1039 1039
  setting_rest_api_enabled: REST-Schnittstelle aktivieren
1040 1040
  setting_self_registration: Registrierung ermöglichen
1041
  setting_show_custom_fields_on_registration: Benutzerdefinierte Felder bei der Registrierung abfragen
1041 1042
  setting_sequential_project_identifiers: Fortlaufende Projektkennungen generieren
1042 1043
  setting_session_lifetime: Längste Dauer einer Sitzung
1043 1044
  setting_session_timeout: Zeitüberschreitung bei Inaktivität
config/locales/en.yml
372 372
  setting_default_language: Default language
373 373
  setting_login_required: Authentication required
374 374
  setting_self_registration: Self-registration
375
  setting_show_custom_fields_on_registration: Show custom fields on registration
375 376
  setting_attachment_max_size: Maximum attachment size
376 377
  setting_issues_export_limit: Issues export limit
377 378
  setting_mail_from: Emission email address
config/settings.yml
31 31
self_registration:
32 32
  default: '2'
33 33
  security_notifications: 1
34
show_custom_fields_on_registration:
35
  default: 1
34 36
lost_password:
35 37
  default: 1
36 38
  security_notifications: 1
37
-