GitLab ist wegen Wartungsarbeiten am Montag, den 10. Mai, zwischen 17:00 und 19:00 Uhr nicht erreichbar.

Commit 9bd53935 authored by emassip's avatar emassip

Use time_zone_select specific helper.

git-svn-id: e93f8b46-1217-0410-a6f0-8f06a7374b81
parent 5c23124c
<%= labelled_fields_for :pref, @user.pref do |pref_fields| %>
<p><%= pref_fields.check_box :hide_mail %></p>
<p><%= :time_zone, ActiveSupport::TimeZone.all.collect {|z| [ z.to_s, ]}, :include_blank => true %></p>
<p><%= pref_fields.time_zone_select :time_zone, nil, :include_blank => true %></p>
<p><%= :comments_sorting, [[l(:label_chronological_order), 'asc'], [l(:label_reverse_chronological_order), 'desc']] %></p>
<p><%= pref_fields.check_box :warn_on_leaving_unsaved %></p>
<% end %>
......@@ -34,6 +34,10 @@ class Redmine::Views::LabelledFormBuilder < ActionView::Helpers::FormBuilder
label_for_field(field, options) + super(field, choices, options, html_options.except(:label)).html_safe
def time_zone_select(field, priority_zones = nil, options = {}, html_options = {})
label_for_field(field, options) + super(field, priority_zones, options, html_options.except(:label)).html_safe
# Returns a label tag for the given field
def label_for_field(field, options = {})
return ''.html_safe if options.delete(:no_label)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment