diff options
| author | Luc Donnet | 2017-09-04 11:09:23 +0200 |
|---|---|---|
| committer | Luc Donnet | 2017-09-04 11:09:23 +0200 |
| commit | dd3ec3c6090b05a0a910b278f51ff7b5d8a92f02 (patch) | |
| tree | 270e2e70a36989e9c7da8b3b56bd2391ca070afa /app/models | |
| parent | ed64dc517bca5f775631d999aa2e60f78d4dae30 (diff) | |
| download | chouette-core-dd3ec3c6090b05a0a910b278f51ff7b5d8a92f02.tar.bz2 | |
Update workbench_import, netex_import and import_resources views Refs #4256 #4257 #4258
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/import.rb | 5 | ||||
| -rw-r--r-- | app/models/import_message.rb | 2 | ||||
| -rw-r--r-- | app/models/import_resource.rb | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/app/models/import.rb b/app/models/import.rb index 939434e67..ff2f57efc 100644 --- a/app/models/import.rb +++ b/app/models/import.rb @@ -5,8 +5,9 @@ class Import < ActiveRecord::Base belongs_to :parent, polymorphic: true - has_many :messages, class_name: "ImportMessage" - has_many :children, foreign_key: :parent_id, class_name: "Import" + has_many :messages, class_name: "ImportMessage", dependent: :destroy + has_many :resources, class_name: "ImportResource", dependent: :destroy + has_many :children, foreign_key: :parent_id, class_name: "Import", dependent: :destroy extend Enumerize enumerize :status, in: %i(new pending successful warning failed running aborted canceled), scope: true diff --git a/app/models/import_message.rb b/app/models/import_message.rb index 5d0f5c862..913f6fd41 100644 --- a/app/models/import_message.rb +++ b/app/models/import_message.rb @@ -1,6 +1,6 @@ class ImportMessage < ActiveRecord::Base belongs_to :import - belongs_to :resource, class_name: ImportResource + belongs_to :resource, class_name: ImportResource, dependent: :destroy enum criticity: [:info, :warning, :error] validates :criticity, presence: true diff --git a/app/models/import_resource.rb b/app/models/import_resource.rb index 3ddd325fd..61c270aa2 100644 --- a/app/models/import_resource.rb +++ b/app/models/import_resource.rb @@ -3,9 +3,9 @@ class ImportResource < ActiveRecord::Base belongs_to :import extend Enumerize - enumerize :status, in: %i(new pending successful failed) + enumerize :status, in: %i(OK ERROR WARNING IGNORED), scope: true - validates_presence_of :name, :type, :reference + validates_presence_of :name, :resource_type, :reference aasm column: :status do state :new, :initial => true |