aboutsummaryrefslogtreecommitdiffstats
path: root/app/models
diff options
context:
space:
mode:
authorXinhui2017-07-27 11:24:20 +0200
committerXinhui2017-07-28 11:16:28 +0200
commit3dc62fad611e745c785dec73d7fec7a655c41a52 (patch)
tree802c630b89cad21fe187cb354f7529be06db4b6e /app/models
parent78bbc9a39f2012bf6d066c3a0f603473fdd340b3 (diff)
downloadchouette-core-3dc62fad611e745c785dec73d7fec7a655c41a52.tar.bz2
Edit factories to comply with new objectid format
Diffstat (limited to 'app/models')
-rw-r--r--app/models/chouette/access_point.rb1
-rw-r--r--app/models/chouette/time_table.rb1
2 files changed, 1 insertions, 1 deletions
diff --git a/app/models/chouette/access_point.rb b/app/models/chouette/access_point.rb
index 9e5dcedf9..04ea40d33 100644
--- a/app/models/chouette/access_point.rb
+++ b/app/models/chouette/access_point.rb
@@ -4,6 +4,7 @@ require 'geo_ruby'
class Chouette::AccessPoint < Chouette::ActiveRecord
# FIXME http://jira.codehaus.org/browse/JRUBY-6358
self.primary_key = "id"
+
include StifReflexAttributesSupport
include Geokit::Mappable
include ProjectionFields
diff --git a/app/models/chouette/time_table.rb b/app/models/chouette/time_table.rb
index f8d45f9b8..2f8188673 100644
--- a/app/models/chouette/time_table.rb
+++ b/app/models/chouette/time_table.rb
@@ -584,7 +584,6 @@ class Chouette::TimeTable < Chouette::TridentActiveRecord
def duplicate
tt = self.deep_clone :include => [:periods, :dates], :except => :object_version
- tt.uniq_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)