Skip to content

Fixes #18: by including a reference to a collections parent_id if pre… #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Fixes #18: by including a reference to a collections parent_id if pre… #19

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8835f9e
Fixes #18: by including a reference to a collections parent_id if pre…
dawilster Mar 21, 2016
3e0d6c3
Use underscore instead of downcase as downcase doesn't take into acco…
dawilster Mar 21, 2016
fcde770
slice for some reason was returning mal formed paths eg. /admin/paren…
dawilster Mar 22, 2016
6dc017f
Build resource through the association chain rather than just on the …
dawilster Mar 22, 2016
3ba7419
Add controller before_create method. Because running controller callb…
dawilster Mar 22, 2016
223f32a
Merge branch 'fix/parent-collection-path' of github.com:Papercloud/ac…
dawilster Mar 22, 2016
f37d7dc
Makes more sense to include the before_create callback as part of the…
dawilster Mar 22, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions lib/active_admin_csv_import/dsl.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,13 @@ def csv_importable(options = {})
collection_action :import_csv do
@columns = columns
@required_columns = required_columns
@collection_path = parent ? collection_path({"#{parent.class.name.underscore}_id" => parent.id}) : collection_path

@post_path = options[:path].try(:call)
@post_path ||= collection_path + '/import_rows'
@post_path ||= @collection_path + '/import_rows'

@redirect_path = options[:redirect_path].try(:call)
@redirect_path ||= collection_path
@redirect_path ||= @collection_path

@delimiter = options[:delimiter]

Expand All @@ -53,7 +54,7 @@ def csv_importable(options = {})
row_number = row_params.delete('_row')

resource = existing_row_resource(options[:import_unique_key], row_params)
resource ||= active_admin_config.resource_class.new
resource ||= build_row_resource

unless update_row_resource(resource, row_params)
@failures << {
Expand Down Expand Up @@ -87,6 +88,12 @@ def update_row_resource(resource, params)
resource.save
end

def build_row_resource
resource = end_of_association_chain.new
Copy link
Member

@tspacek tspacek Mar 23, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does build work here instead of new? Might be a bit more idiomatic.

# controller before create callback
resource = before_create(resource) if respond_to? :before_create
Copy link
Member

@tspacek tspacek Mar 23, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This feels a bit odd. Should at least be namespaced to CSV. Was this something here already?

Copy link
Author

@dawilster dawilster Mar 23, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yea, good point namespacing. It's a new addition, it felt right to put the build logic into it's own method but it's something we could of easily had left in the import_csv action

end

def existing_row_resource(lookup_column, params)
return unless lookup_column

Expand Down