rails_admin_import 0.1.1 → 0.1.2

data/README.md

@@ -10,15 +10,15 @@ Installation
     
         gem "rails_admin_import", :git => "git://github.com/stephskardal/rails_admin_import.git"
 
-* Next, mount in your application by adding:
+* Next, mount in your application by adding following line to your config/routes.rb:
 
-        mount RailsAdminImport::Engine => '/rails_admin_import', :as => 'rails_admin_import'" to config/routes
+        mount RailsAdminImport::Engine => '/rails_admin_import', :as => 'rails_admin_import'
 
-* Add to cancan to allow access to import:
+* Add to cancan to allow access to import in your app/models/ability.rb:
 
         can :import, [User, Model1, Model2]
 
-* Define configuration:
+* Define configuration in config/initializers/rails_admin.rb:
 
         RailsAdminImport.config do |config| 
           config.model User do
@@ -40,7 +40,7 @@ Installation
           self.import_nested_data(row, map)
         end
 
-* "import" action must be added inside config.actions block in main application RailsAdmin configuration.
+* "import" action must be added inside config.actions block in main application RailsAdmin configuration: config/initializers/rails_admin.rb.
 
         config.actions do
           ...
@@ -48,11 +48,12 @@ Installation
           ...
         end
 
+  Refer to [RailAdmin documentation on custom actions](https://github.com/sferik/rails_admin/wiki/Actions) that must be present in this block.
+
+
 * TODO: Right now, import doesn't work for fields ending in s, because inflector fails in models ending in s singularly. Belongs_to and many
   mapping needs to be updated to use klasses instead of symbols
 
-  Refer to RailAdmin documentation on custom actions that must be present in this block.
-
 TODO
 ========
 

data/app/views/rails_admin/main/import.html.erb

@@ -1,11 +1,11 @@
 <% if @response -%>
 <% if @response.has_key?(:error) -%>
-<div class="alert-message error">
+<div class="alert-error alert">
 <%= @response[:error] %>
 </div>
 <% end -%>
 <% if @response.has_key?(:notice) -%>
-<div class="alert-message notice">
+<div class="alert-success alert">
 <%= @response[:notice] %>
 </div>
 <% end -%>

data/lib/rails_admin_import/import.rb

@@ -74,6 +74,12 @@ module RailsAdminImport
           else
             map[key.to_sym] = i 
           end
+        end
+ 
+        update = params.has_key?(:update_if_exists) && params[:update_if_exists] ? params[:update_lookup].to_sym : nil
+
+        if update && !map.has_key?(params[:update_lookup].to_sym)
+          return results = { :success => [], :error => ["Your file must contain a column for the 'Update lookup field' you selected."] }
         end 
   
         results = { :success => [], :error => [] }
@@ -88,8 +94,6 @@ module RailsAdminImport
  
         label_method = RailsAdminImport.config(self).label
 
-        update = params.has_key?(:update_if_exists) && params[:update_if_exists] ? params[:update_lookup].to_sym : nil
- 
         file.each do |row|
           object = self.import_initialize(row, map, update)
           object.import_belongs_to_data(associated_map, row, map)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin_import
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-13 00:00:00.000000000 Z
+date: 2012-08-10 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: steph@endpoint.com