github-migration/engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more information in the logs when errors during the import + import asset collections without custom fields

Browse Source
This commit is contained in:
dinedine 2011-01-30 00:20:15 +01:00
parent e896618c99
commit da51dbc14e
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/admin/imports_controller.rb
View File

@ -32,7 +32,7 @@ module Admin
redirect_to Locomotive.config.delayed_job ? admin_import_url : new_admin_import_url redirect_to Locomotive.config.delayed_job ? admin_import_url : new_admin_import_url
rescue Exception => e rescue Exception => e
logger.error "[Locomotive import] #{e.message}" logger.error "[Locomotive import] #{e.message} / #{e.backtrace}"
@error = t('errors.messages.invalid_theme_file') @error = t('errors.messages.invalid_theme_file')
flash[:alert] = t('flash.admin.imports.create.alert') flash[:alert] = t('flash.admin.imports.create.alert')

2
lib/locomotive/import/asset_collections.rb
View File

@ -37,6 +37,8 @@ module Locomotive
end end
def add_or_update_fields(asset_collection, fields) def add_or_update_fields(asset_collection, fields)
return if fields.blank?
fields.each_with_index do |data, position| fields.each_with_index do |data, position|
name, data = data.keys.first, data.values.first name, data = data.keys.first, data.values.first