bike/BikeBikeBike
1
0
Fork 0
Code Issues 5 Pull Requests Projects Releases Wiki Activity

Let translation controls save nil translations

Browse Source
This commit is contained in:
Godwin
2016-12-24 12:21:40 -08:00
parent 116885f6dd
commit 92a9224716
4 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/helpers/application_helper.rb
+4 -4
View File
@@ -1313,7 +1313,7 @@ module ApplicationHelper
field_options.each do | name, __options |
_options = __options.deep_dup
# add the field
value = object.is_a?(Hash) ? object[locale.to_sym] : object.get_column_for_locale!(name, locale)
value = object.is_a?(Hash) ? object[locale.to_sym] : object.get_column_for_locale!(name, locale, false)
# use the default value if we need to
if _options[:default].present? && value.blank?
@@ -1368,7 +1368,7 @@ module ApplicationHelper
class: class_name, data: { locale: locale }).html_safe
# add the field
value = object.is_a?(Hash) ? object[locale.to_sym] : object.get_column_for_locale!(name, locale)
value = object.is_a?(Hash) ? object[locale.to_sym] : object.get_column_for_locale!(name, locale, false)
# use the default value if we need to
if options[:default].present? && value.blank?
@@ -1412,11 +1412,11 @@ module ApplicationHelper
if options[:label] == false
label_id = options[:labelledby]
elsif options[:label].present?
html += label_tag(id, nil, id: label_id) do
html += label_tag([name, id], nil, id: label_id) do
_(options[:label], :t, vars: options[:vars] || {})
end
else
html += label_tag(id, nil, id: label_id)
html += label_tag([name, id], nil, id: label_id)
end
if options[:help].present?