diff options
Diffstat (limited to 'app/models/stop_area_referential.rb')
| -rw-r--r-- | app/models/stop_area_referential.rb | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/app/models/stop_area_referential.rb b/app/models/stop_area_referential.rb index 5709a43a9..159ee07b3 100644 --- a/app/models/stop_area_referential.rb +++ b/app/models/stop_area_referential.rb @@ -1,21 +1,13 @@ class StopAreaReferential < ActiveRecord::Base extend Enumerize -<<<<<<< HEAD include ObjectidFormatterSupport -======= - include ObjectidFormaterSupport ->>>>>>> Create objectid format and integrate it in models. Work in progress. Refs #4941 has_many :stop_area_referential_memberships has_many :organisations, through: :stop_area_referential_memberships has_many :stop_areas, class_name: 'Chouette::StopArea' has_many :stop_area_referential_syncs, -> {order created_at: :desc} has_many :workbenches -<<<<<<< HEAD enumerize :objectid_format, in: %w(netex stif_netex stif_reflex stif_codifligne), default: 'netex' -======= - enumerize :objectid_format, in: %w(netex stif_netex stif_reflex stif_codifligne) ->>>>>>> Create objectid format and integrate it in models. Work in progress. Refs #4941 validates_presence_of :objectid_format def add_member(organisation, options = {}) |