From 2c1f02356b0a3914bc7391d2cee421c1f613f286 Mon Sep 17 00:00:00 2001 From: Ben Wiseley Date: Fri, 10 Jun 2016 08:17:14 -0700 Subject: [PATCH 1/2] Fix annoying deprication warning There's already a pull request for this on the original project but that project hasn't been looked at by the owner in 3 year. https://github.com/krhorst/active_admin_importable/pull/29/files --- lib/active_admin_importable/dsl.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/active_admin_importable/dsl.rb b/lib/active_admin_importable/dsl.rb index ea79938..fbed331 100644 --- a/lib/active_admin_importable/dsl.rb +++ b/lib/active_admin_importable/dsl.rb @@ -1,7 +1,7 @@ module ActiveAdminImportable module DSL def active_admin_importable(&block) - action_item :only => :index do + action_item :edit, :only => :index do link_to "Import #{active_admin_config.resource_name.to_s.pluralize}", :action => 'upload_csv' end @@ -15,4 +15,4 @@ def active_admin_importable(&block) end end end -end \ No newline at end of file +end From bd9edf9b6e19de269f496b8150c0c39565a4b5f9 Mon Sep 17 00:00:00 2001 From: Dave Qorashi Date: Tue, 16 Aug 2016 14:22:02 -0700 Subject: [PATCH 2/2] Make active_admin_importable method to accept an optional title --- lib/active_admin_importable/dsl.rb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/active_admin_importable/dsl.rb b/lib/active_admin_importable/dsl.rb index fbed331..cbdb9a0 100644 --- a/lib/active_admin_importable/dsl.rb +++ b/lib/active_admin_importable/dsl.rb @@ -1,8 +1,9 @@ module ActiveAdminImportable module DSL - def active_admin_importable(&block) + def active_admin_importable(args = {}, &block) action_item :edit, :only => :index do - link_to "Import #{active_admin_config.resource_name.to_s.pluralize}", :action => 'upload_csv' + args[:title] ||= active_admin_config.resource_name.to_s.pluralize + link_to "Import #{args[:title]}", :action => 'upload_csv' end collection_action :upload_csv do @@ -10,8 +11,9 @@ def active_admin_importable(&block) end collection_action :import_csv, :method => :post do + args[:title] ||= active_admin_config.resource_name.to_s.pluralize CsvDb.convert_save(active_admin_config.resource_class, params[:dump][:file], &block) - redirect_to :action => :index, :notice => "#{active_admin_config.resource_name.to_s} imported successfully!" + redirect_to :action => :index, :notice => "#{args[:title]} imported successfully!" end end end