Merge branch 'master' into 2-0-stable-Mar6

app/controllers/admin/cache_settings_controller.rb

@@ -1,8 +1,7 @@
 require 'open_food_network/products_cache_integrity_checker'
 
 class Admin::CacheSettingsController < Spree::Admin::BaseController
-
-  def show
+  def edit
     @results = Exchange.cachable.map do |exchange|
       checker = OpenFoodNetwork::ProductsCacheIntegrityChecker.new(exchange.receiver, exchange.order_cycle)
 
@@ -10,4 +9,10 @@ class Admin::CacheSettingsController < Spree::Admin::BaseController
     end
   end
 
+  def update
+    Spree::Config.set(params[:preferences])
+    respond_to do |format|
+      format.html { redirect_to main_app.edit_admin_cache_settings_path }
+    end
+  end
 end

app/controllers/admin/product_import_controller.rb

@@ -79,11 +79,9 @@ module Admin
     end
 
     def save_uploaded_file(upload)
-      filename = 'import' + Time.zone.now.strftime('%d-%m-%Y-%H-%M-%S')
-      extension = '.' + upload.original_filename.split('.').last
-      directory = 'tmp/product_import'
-      Dir.mkdir(directory) unless File.exist?(directory)
-      File.open(Rails.root.join(directory, filename + extension), 'wb') do |f|
+      extension = File.extname(upload.original_filename)
+      directory = Dir.mktmpdir 'product_import'
+      File.open(File.join(directory, "import#{extension}"), 'wb') do |f|
         data = UploadSanitizer.new(upload.read).call
         f.write(data)
         f.path