github-migration/engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

import theme from the rails console is now possible

Browse Source
This commit is contained in:
dinedine 2011-02-04 15:43:43 +01:00
parent 6ac4ff0393
commit 0be4c93924
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/locomotive/import/job.rb
View File

@ -91,12 +91,16 @@ module Locomotive
def store_zipfile(zipfile) def store_zipfile(zipfile)
return nil if zipfile.blank? return nil if zipfile.blank?
file = CarrierWave::SanitizedFile.new(zipfile)
uploader = self.get_uploader(@site) uploader = self.get_uploader(@site)
begin begin
uploader.store!(file) if zipfile.is_a?(String) && zipfile =~ /^http:\/\//
uploader.download!(zipfile)
uploader.store!
else
file = CarrierWave::SanitizedFile.new(zipfile)
uploader.store!(file)
end
uploader.identifier uploader.identifier
rescue CarrierWave::IntegrityError rescue CarrierWave::IntegrityError
nil nil