diff options
| author | Robert | 2017-12-05 09:18:19 +0100 |
|---|---|---|
| committer | Robert | 2017-12-05 12:19:42 +0100 |
| commit | 089c6935ca0e036de484834381e5beda7545d499 (patch) | |
| tree | af6b9696de8069631234f032cf62e685e8039162 /app | |
| parent | 8848d279b4d3a27c1ddebe7636a49abe545ba73a (diff) | |
| download | chouette-core-089c6935ca0e036de484834381e5beda7545d499.tar.bz2 | |
Refs: #5179@1h; Referential Creation Enforces objectid_format from associated Workbench [skip-ci]
- speced the `define_default_attributes` part
- speced the Reference.new_from part
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/concerns/objectid_formatter_support.rb | 10 | ||||
| -rw-r--r-- | app/models/referential.rb | 4 |
2 files changed, 11 insertions, 3 deletions
diff --git a/app/models/concerns/objectid_formatter_support.rb b/app/models/concerns/objectid_formatter_support.rb index 34a51740f..d0b85d8ac 100644 --- a/app/models/concerns/objectid_formatter_support.rb +++ b/app/models/concerns/objectid_formatter_support.rb @@ -1,9 +1,17 @@ module ObjectidFormatterSupport extend ActiveSupport::Concern + class << self + def legal_formats + %w(netex stif_netex stif_reflex stif_codifligne) + end + + def default_format; 'netex' end + end + included do extend Enumerize - enumerize :objectid_format, in: %w(netex stif_netex stif_reflex stif_codifligne), default: 'netex' + enumerize :objectid_format, in: ObjectidFormatterSupport.legal_formats, default: ObjectidFormatterSupport.default_format validates_presence_of :objectid_format def objectid_formatter diff --git a/app/models/referential.rb b/app/models/referential.rb index ee74bd9f5..233a9f24a 100644 --- a/app/models/referential.rb +++ b/app/models/referential.rb @@ -140,8 +140,8 @@ class Referential < ActiveRecord::Base end def self.new_from(from, functional_scope) - Referential.new( - name: I18n.t("activerecord.copy", :name => from.name), +e Referential.new( + name: I18n.t("activerecord.copy", name: from.name), slug: "#{from.slug}_clone", prefix: from.prefix, time_zone: from.time_zone, |
