diff options
| author | Xinhui | 2017-08-31 16:09:22 +0200 |
|---|---|---|
| committer | Xinhui | 2017-08-31 16:09:22 +0200 |
| commit | 87bde1328864171920960cb52c394d32452bb1c5 (patch) | |
| tree | eadae7bf8ac4e04ab60707feb6771ca398fa769d | |
| parent | 69e786ccb4a08b045708670d712ac1343e053099 (diff) | |
| download | chouette-core-87bde1328864171920960cb52c394d32452bb1c5.tar.bz2 | |
Default local_id
| -rw-r--r-- | app/models/chouette/time_table.rb | 4 | ||||
| -rw-r--r-- | app/models/concerns/stif_netex_attributes_support.rb | 4 | ||||
| -rw-r--r-- | spec/models/chouette/time_table_spec.rb | 1 |
3 files changed, 6 insertions, 3 deletions
diff --git a/app/models/chouette/time_table.rb b/app/models/chouette/time_table.rb index 38e5cfb88..448070bcf 100644 --- a/app/models/chouette/time_table.rb +++ b/app/models/chouette/time_table.rb @@ -27,7 +27,7 @@ class Chouette::TimeTable < Chouette::TridentActiveRecord after_save :save_shortcuts def local_id - "#{self.objectid.local_id}" + "#{self.referential.id}-#{self.id}" end accepts_nested_attributes_for :dates, :allow_destroy => :true @@ -583,7 +583,7 @@ class Chouette::TimeTable < Chouette::TridentActiveRecord end def duplicate - tt = self.deep_clone :include => [:periods, :dates], :except => :object_version + tt = self.deep_clone :include => [:periods, :dates], :except => [:object_version, :objectid] tt.tag_list.add(*self.tag_list) unless self.tag_list.empty? tt.created_from = self tt.comment = I18n.t("activerecord.copy", :name => self.comment) diff --git a/app/models/concerns/stif_netex_attributes_support.rb b/app/models/concerns/stif_netex_attributes_support.rb index 782a75295..40fdb7444 100644 --- a/app/models/concerns/stif_netex_attributes_support.rb +++ b/app/models/concerns/stif_netex_attributes_support.rb @@ -24,6 +24,10 @@ module StifNetexAttributesSupport errors.add :objectid, I18n.t("activerecord.errors.models.stif_netex.invalid_object_id") if !objectid.valid? end + def local_id + "#{self.referential.id}-#{self.id}" + end + def build_objectid if objectid.include? ':__pending_id__' self.objectid = Chouette::StifNetexObjectid.create(self.provider_id, self.model_name, self.local_id, self.boiv_id) diff --git a/spec/models/chouette/time_table_spec.rb b/spec/models/chouette/time_table_spec.rb index d7738bbf6..097eaedf9 100644 --- a/spec/models/chouette/time_table_spec.rb +++ b/spec/models/chouette/time_table_spec.rb @@ -1194,7 +1194,6 @@ end target=subject.duplicate expect(target.id).to be_nil expect(target.comment).to eq(I18n.t("activerecord.copy", name: subject.comment)) - expect(target.objectid).to eq(subject.objectid+"_1") expect(target.int_day_types).to eq(subject.int_day_types) expect(target.dates.size).to eq(subject.dates.size) target.dates.each do |d| |