fix, make delayed import explicit

1 files changed, 1 insertions, 12 deletions

diff --git a/app/models/import.rb b/app/models/import.rb
index e0c95f911..629d54a42 100644
--- a/app/models/import.rb
+++ b/app/models/import.rb
@@ -6,7 +6,6 @@ class Import < ActiveRecord::Base
 
   validates_inclusion_of :status, :in => %w{ pending completed failed }
 
-  attr_accessor :background
   attr_accessor :resources
   attr_accessor :loader
 
@@ -73,19 +72,9 @@ class Import < ActiveRecord::Base
     end
   end
 
-  after_create :delayed_import
   def delayed_import
     save_resources
-    if import_in_background?
-      delay.import
-    else
-      # do not call self.inport
-      import
-    end
-  end
-
-  def import_in_background?
-    return background.nil? || background
+    delay.import
   end
 
   @@root = "#{Rails.root}/tmp/imports"