diff options
| author | Zog | 2018-04-30 07:12:49 +0200 | 
|---|---|---|
| committer | Zog | 2018-05-07 15:03:07 +0200 | 
| commit | 657fea85b193fb9908dcaa42391bec230e93d857 (patch) | |
| tree | a14caaca05bdd7a500a765ca768c15986b7fd740 /app/models/import/netex.rb | |
| parent | 42ac1fa61ea79fe612bcd98f2b38bad5b6f24421 (diff) | |
| download | chouette-core-657fea85b193fb9908dcaa42391bec230e93d857.tar.bz2 | |
Fix NETEX imports
Diffstat (limited to 'app/models/import/netex.rb')
| -rw-r--r-- | app/models/import/netex.rb | 7 | 
1 files changed, 3 insertions, 4 deletions
| diff --git a/app/models/import/netex.rb b/app/models/import/netex.rb index e27f1a34c..f64a18e98 100644 --- a/app/models/import/netex.rb +++ b/app/models/import/netex.rb @@ -2,15 +2,12 @@ require 'net/http'  class Import::Netex < Import::Base    before_destroy :destroy_non_ready_referential -  after_commit :call_iev_callback, on: :create -    after_commit do      main_resource.update_status_from_importer self.status      true    end    before_save do -    self.status = 'aborted' unless referential      self.referential&.failed! if self.status == 'aborted' || self.status == 'failed'    end @@ -47,7 +44,7 @@ class Import::Netex < Import::Base        save!      else        Rails.logger.info "Can't create referential for import #{self.id}: #{referential.inspect} #{referential.metadatas.inspect} #{referential.errors.messages}" -      aborted! +        if referential.metadatas.all?{|m| m.line_ids.empty? && m.line_ids.empty?}          create_message criticity: :error, message_key: "referential_creation_missing_lines", message_attributes: {referential_name: referential.name}        elsif (overlapped_referential_ids = referential.overlapped_referential_ids).any? @@ -69,6 +66,8 @@ class Import::Netex < Import::Base            resource_attributes: referential.errors.messages          )        end +      self.referential = nil +      aborted!      end    end | 
