diff options
| author | Xinhui Xu | 2017-11-30 11:09:36 +0100 |
|---|---|---|
| committer | GitHub | 2017-11-30 11:09:36 +0100 |
| commit | a7930abe5a70b8b964af0dcbf86fe0a587ea98cb (patch) | |
| tree | dc8e1a1ff57ff0328e4b8b2ac72932f82e379406 /app/models | |
| parent | fb7ad0e23e73954e6e5d172d61edb31cd686b8b4 (diff) | |
| parent | 7b019504fd792293f1112b2375228505fab303fe (diff) | |
| download | chouette-core-a7930abe5a70b8b964af0dcbf86fe0a587ea98cb.tar.bz2 | |
Merge branch 'master' into 4981_last_editor
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/chouette/line.rb | 4 | ||||
| -rw-r--r-- | app/models/chouette/network.rb | 11 | ||||
| -rw-r--r-- | app/models/concerns/objectid_support.rb | 2 |
3 files changed, 14 insertions, 3 deletions
diff --git a/app/models/chouette/line.rb b/app/models/chouette/line.rb index 16d7ec6f6..784e3f5b9 100644 --- a/app/models/chouette/line.rb +++ b/app/models/chouette/line.rb @@ -4,8 +4,8 @@ module Chouette include LineRestrictions include LineReferentialSupport include ObjectidSupport - extend StifTransportModeEnumerations - extend StifTransportSubmodeEnumerations + include StifTransportModeEnumerations + include StifTransportSubmodeEnumerations extend ActiveModel::Naming # FIXME http://jira.codehaus.org/browse/JRUBY-6358 diff --git a/app/models/chouette/network.rb b/app/models/chouette/network.rb index d64ef038a..9b3f2fe29 100644 --- a/app/models/chouette/network.rb +++ b/app/models/chouette/network.rb @@ -4,12 +4,23 @@ module Chouette include NetworkRestrictions include LineReferentialSupport include ObjectidSupport + extend Enumerize # FIXME http://jira.codehaus.org/browse/JRUBY-6358 self.primary_key = "id" has_many :lines attr_accessor :source_type_name + enumerize :source_type_name, in: %w(public_and_private_utilities + road_authorities + transit_operator + public_transport + passenger_transport_coordinating_authority + travel_information_service_provider + travel_agency + individual_subject_of_travel_itinerary + other_information) + validates_format_of :registration_number, :with => %r{\A[0-9A-Za-z_-]+\Z}, :allow_nil => true, :allow_blank => true validates_presence_of :name diff --git a/app/models/concerns/objectid_support.rb b/app/models/concerns/objectid_support.rb index 85b5da3a8..cec36678e 100644 --- a/app/models/concerns/objectid_support.rb +++ b/app/models/concerns/objectid_support.rb @@ -27,4 +27,4 @@ module ObjectidSupport get_objectid.try(:class) end end -end
\ No newline at end of file +end |