diff options
| author | Guillaume | 2017-10-31 11:54:08 +0100 |
|---|---|---|
| committer | Guillaume | 2017-10-31 11:54:08 +0100 |
| commit | f201d7cdd68ca554e7a99eb791baf48a540b8978 (patch) | |
| tree | 428c823e77c330cdc5ea85e03ff34805bdae854e /app/models/import.rb | |
| parent | 90173e6bdd12d1aabe68a0d28f4f228782d3adf0 (diff) | |
| parent | 718d9ab7f8d5b1cd125ee341bd098c41615a0cbd (diff) | |
| download | chouette-core-f201d7cdd68ca554e7a99eb791baf48a540b8978.tar.bz2 | |
Merge branch 'master' into 4755-page_for_validate_referential
Diffstat (limited to 'app/models/import.rb')
| -rw-r--r-- | app/models/import.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/import.rb b/app/models/import.rb index 64f713914..e0aae6ef1 100644 --- a/app/models/import.rb +++ b/app/models/import.rb @@ -18,6 +18,7 @@ class Import < ActiveRecord::Base validates :file, presence: true validates_presence_of :workbench, :creator + validates_format_of :file, with: %r{\.zip\z}i, message: I18n.t('activerecord.errors.models.imports.wrong_file_extension') before_create :initialize_fields @@ -34,7 +35,7 @@ class Import < ActiveRecord::Base end def self.finished_statuses - symbols_with_indifferent_access(%i(successful failed aborted canceled)) + symbols_with_indifferent_access(%i(successful failed warning aborted canceled)) end def notify_parent |
