From a072b918f274fe902226ae4cc376b318e3881c5f Mon Sep 17 00:00:00 2001
From: Alban Peignier
Date: Fri, 29 Dec 2017 10:51:00 +0100
Subject: Validates import file extension with CarrierWave extension_whitelist.
 Refs #4762

---
 app/models/import.rb             | 1 -
 app/uploaders/import_uploader.rb | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'app')

diff --git a/app/models/import.rb b/app/models/import.rb
index 19e835986..049a65f40 100644
--- a/app/models/import.rb
+++ b/app/models/import.rb
@@ -19,7 +19,6 @@ class Import < ActiveRecord::Base
   validates :name, presence: true
   validates :file, presence: true
   validates_presence_of :workbench, :creator
-  validates_format_of :file, with: %r{\.zip\z}i, message: I18n.t('activerecord.errors.models.import.attributes.file.wrong_file_extension')
 
   before_create :initialize_fields
 
diff --git a/app/uploaders/import_uploader.rb b/app/uploaders/import_uploader.rb
index 2740393ca..60e17ca0f 100644
--- a/app/uploaders/import_uploader.rb
+++ b/app/uploaders/import_uploader.rb
@@ -36,9 +36,9 @@ class ImportUploader < CarrierWave::Uploader::Base
 
   # Add a white list of extensions which are allowed to be uploaded.
   # For images you might use something like this:
-  # def extension_whitelist
-  #   %w(jpg jpeg gif png)
-  # end
+  def extension_whitelist
+    %w(zip)
+  end
 
   # Override the filename of the uploaded files:
   # Avoid using model.id or version_name here, see uploader/store.rb for details.
-- 
cgit v1.2.3