add object_id_format to migrations, create module for call Referential, Line Referential, StopAreaReferential in models, add Enumerize in models Refs #4941

4 files changed, 17 insertions, 4 deletions

diff --git a/app/models/chouette/journey_pattern.rb b/app/models/chouette/journey_pattern.rb
index 0c1905286..dce674791 100644
--- a/app/models/chouette/journey_pattern.rb
+++ b/app/models/chouette/journey_pattern.rb
@@ -21,8 +21,6 @@ module Chouette
     enum section_status: { todo: 0, completed: 1, control: 2 }
 
     attr_accessor  :control_checked
-    after_update :control_route_sections, :unless => "control_checked"
-
 
     def local_id
       "IBOO-#{self.referential.id}-#{self.route.line.get_objectid.local_id}-#{self.id}"
diff --git a/app/models/chouette/line.rb b/app/models/chouette/line.rb
index 780f6473f..d50395182 100644
--- a/app/models/chouette/line.rb
+++ b/app/models/chouette/line.rb
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 module Chouette
   class Line < Chouette::ActiveRecord
     include LineRestrictions
@@ -5,6 +6,15 @@ module Chouette
     include ObjectidSupport
     extend StifTransportModeEnumerations
     extend StifTransportSubmodeEnumerations
+=======
+class Chouette::Line < Chouette::ActiveRecord
+  include StifCodifligneAttributesSupport
+  include LineRestrictions
+  include LineReferentialSupport
+  include ObjectIdFormat
+  extend StifTransportModeEnumerations
+  extend StifTransportSubmodeEnumerations
+>>>>>>> add object_id_format to migrations, create module for call Referential, Line Referential, StopAreaReferential in models, add Enumerize in models Refs #4941
 
     extend ActiveModel::Naming
 
diff --git a/app/models/concerns/object_id_format.rb b/app/models/concerns/object_id_format.rb
new file mode 100644
index 000000000..55b93ec81
--- /dev/null
+++ b/app/models/concerns/object_id_format.rb
@@ -0,0 +1,5 @@
+module ObjectIdFormat
+  def object_id_format
+    self.referential.object_id_format
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 21aa73cd8..830e3ca25 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20171114102438) do
+ActiveRecord::Schema.define(version: 20171109101605) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -408,9 +408,9 @@ ActiveRecord::Schema.define(version: 20171114102438) do
     t.string   "type"
     t.integer  "parent_id",             limit: 8
     t.string   "parent_type"
+    t.datetime "notified_parent_at"
     t.integer  "current_step",                    default: 0
     t.integer  "total_steps",                     default: 0
-    t.datetime "notified_parent_at"
     t.string   "creator"
   end