Merge pull request #65 from ifyouseewendy/fix_merge

Fix merging failed message

Author: Fivell

lib/active_admin_import/dsl.rb

@@ -33,11 +33,11 @@ module DSL
         flash[:warning] = I18n.t('active_admin_import.file_empty_error')
       else
         if result.has_failed?
-          flash[:error] = I18n.t('active_admin_import.failed', count: result.failed.count, model: model_name, plural_model: plural_model_name)
+          flash[:error] = I18n.t('active_admin_import.failed', count: result.failed.count, model: model_name, plural_model: plural_model_name, message: result.failed_message(limit: 5))
           return if options[:batch_transaction]
         end
         if result.has_imported?
-          flash[:error] = I18n.t('active_admin_import.failed', count: result.failed.count, model: model_name, plural_model: plural_model_name, message: result.failed_message(limit: 5))
+          flash[:notice] = I18n.t('active_admin_import.imported', count: result.imported_qty, model: model_name, plural_model: plural_model_name)
         end
       end
     end