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

Fixed event editing

Browse Source
This commit is contained in:
Godwin 2017-08-19 18:43:59 -07:00
parent c2598aa47f
commit c3591ba987
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/conference_administration_controller.rb
View File

@ -44,6 +44,7 @@ class ConferenceAdministrationController < ApplicationController
end
def edit_event
@event = Event.find(params[:id])
administration_step(:event_edit)
end
@ -1473,11 +1474,11 @@ class ConferenceAdministrationController < ApplicationController
# save translations
(params[:info] || {}).each do |locale, value|
event.set_column_for_locale(:title, locale, html_value(value), current_user.id) unless value = event._title(locale)
event.set_column_for_locale(:info, locale, value, current_user.id) if value != event._info(locale) && view_context.strip_tags(value).strip.present?
end
(params[:title] || {}).each do |locale, value|
event.set_column_for_locale(:info, locale, value, current_user.id) unless value = event._info(locale)
event.set_column_for_locale(:title, locale, html_value(value), current_user.id) if value != event._title(locale) && view_context.strip_tags(value).strip.present?
end
event.save

4
app/helpers/form_helper.rb
View File

@ -27,9 +27,7 @@ module FormHelper
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?
value = _(_options[:default], locale: locale)
end
value = _(_options[:default], locale: locale) if _options[:default].present? && value.blank?
_options[:index] = locale
_options[:lang] = locale