aboutsummaryrefslogtreecommitdiffstats
path: root/app/models
diff options
context:
space:
mode:
Diffstat (limited to 'app/models')
-rw-r--r--app/models/chouette.rb5
-rw-r--r--app/models/chouette/active_record.rb4
-rw-r--r--app/models/chouette/stop_point.rb2
-rw-r--r--app/models/chouette/timeband.rb2
4 files changed, 12 insertions, 1 deletions
diff --git a/app/models/chouette.rb b/app/models/chouette.rb
new file mode 100644
index 000000000..fe49300d4
--- /dev/null
+++ b/app/models/chouette.rb
@@ -0,0 +1,5 @@
+module Chouette
+ def self.use_relative_model_naming?
+ true
+ end
+end \ No newline at end of file
diff --git a/app/models/chouette/active_record.rb b/app/models/chouette/active_record.rb
index e12f30266..c2aab9d50 100644
--- a/app/models/chouette/active_record.rb
+++ b/app/models/chouette/active_record.rb
@@ -24,6 +24,10 @@ module Chouette
end
end
+ def self.model_name
+ ActiveModel::Name.new self, Chouette, self.name.demodulize
+ end
+
# TODO: Can we remove this?
# class << self
# alias_method :create_reflection_without_chouette_naming, :create_reflection
diff --git a/app/models/chouette/stop_point.rb b/app/models/chouette/stop_point.rb
index 86be39d70..f4c9b3800 100644
--- a/app/models/chouette/stop_point.rb
+++ b/app/models/chouette/stop_point.rb
@@ -2,7 +2,7 @@ module Chouette
class StopPoint < Chouette::TridentActiveRecord
def self.policy_class
- Chouette::RoutePolicy
+ RoutePolicy
end
include ForBoardingEnumerations
diff --git a/app/models/chouette/timeband.rb b/app/models/chouette/timeband.rb
index da8bc3dea..21c81ab1c 100644
--- a/app/models/chouette/timeband.rb
+++ b/app/models/chouette/timeband.rb
@@ -8,6 +8,8 @@ module Chouette
end
class Timeband < Chouette::TridentActiveRecord
+ include ObjectidSupport
+
self.primary_key = "id"
validates :start_time, :end_time, presence: true