aboutsummaryrefslogtreecommitdiffstats
path: root/app/models/chouette
diff options
context:
space:
mode:
authorXinhui2017-08-31 16:09:22 +0200
committerXinhui2017-08-31 16:09:22 +0200
commit87bde1328864171920960cb52c394d32452bb1c5 (patch)
treeeadae7bf8ac4e04ab60707feb6771ca398fa769d /app/models/chouette
parent69e786ccb4a08b045708670d712ac1343e053099 (diff)
downloadchouette-core-87bde1328864171920960cb52c394d32452bb1c5.tar.bz2
Default local_id
Diffstat (limited to 'app/models/chouette')
-rw-r--r--app/models/chouette/time_table.rb4
1 files changed, 2 insertions, 2 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)