diff options
| author | cedricnjanga | 2018-05-16 10:26:15 -0700 |
|---|---|---|
| committer | Johan Van Ryseghem | 2018-05-29 08:41:43 +0200 |
| commit | d1f7307f3aaf595cc46cbd1249eef10ab0092321 (patch) | |
| tree | 9f66e1bea571a2015f5338d3cffc062bcf3d219d /app/models | |
| parent | f5cb11a5dc3b77d6fd238578401b0a06e408cb79 (diff) | |
| download | chouette-core-d1f7307f3aaf595cc46cbd1249eef10ab0092321.tar.bz2 | |
Refs #6916 Fix import file format validation
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/concerns/iev_interfaces/task.rb | 2 | ||||
| -rw-r--r-- | app/models/import/base.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/models/concerns/iev_interfaces/task.rb b/app/models/concerns/iev_interfaces/task.rb index e40808009..76bcec699 100644 --- a/app/models/concerns/iev_interfaces/task.rb +++ b/app/models/concerns/iev_interfaces/task.rb @@ -7,6 +7,8 @@ module IevInterfaces::Task belongs_to :referential mount_uploader :file, ImportUploader + validates_presence_of :file, presence: true, unless: Proc.new {|import| import.errors[:file].present? } + validates_integrity_of :file has_many :children, foreign_key: :parent_id, class_name: self.name, dependent: :destroy diff --git a/app/models/import/base.rb b/app/models/import/base.rb index dcd710e58..7c1cfaa50 100644 --- a/app/models/import/base.rb +++ b/app/models/import/base.rb @@ -1,6 +1,5 @@ class Import::Base < ApplicationModel self.table_name = "imports" - validates :file, presence: true def self.messages_class_name "Import::Message" |
