diff options
| author | cedricnjanga | 2017-09-22 13:13:38 +0200 |
|---|---|---|
| committer | cedricnjanga | 2017-09-22 13:13:38 +0200 |
| commit | c8e5212c9cb03c891db6198d3f5cb58607a805ab (patch) | |
| tree | f4a2e4a29b4ea6a917e0e689e50d6631af0e94c3 | |
| parent | 2de67ce01ddf37df8f6b79bd17e5d2645faade50 (diff) | |
| parent | 4e4fa1116b5a2d7e039ae98706657f3eb919ee7a (diff) | |
| download | chouette-core-c8e5212c9cb03c891db6198d3f5cb58607a805ab.tar.bz2 | |
Merge branch 'master' into staging
| -rw-r--r-- | app/models/chouette/stif_netex_objectid.rb | 2 | ||||
| -rw-r--r-- | app/models/concerns/stif_netex_attributes_support.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/models/chouette/stif_netex_objectid.rb b/app/models/chouette/stif_netex_objectid.rb index a0a91668a..93e7a1e85 100644 --- a/app/models/chouette/stif_netex_objectid.rb +++ b/app/models/chouette/stif_netex_objectid.rb @@ -3,7 +3,7 @@ class Chouette::StifNetexObjectid < String parts.present? end - @@format = /^([A-Za-z_]+):([A-Za-z]+):([0-9A-Za-z_-]+):([A-Za-z]+)$/ + @@format = /^([A-Za-z_-]+):([A-Za-z]+):([0-9A-Za-z_-]+):([A-Za-z]+)$/ cattr_reader :format def parts diff --git a/app/models/concerns/stif_netex_attributes_support.rb b/app/models/concerns/stif_netex_attributes_support.rb index 795872755..0d569b613 100644 --- a/app/models/concerns/stif_netex_attributes_support.rb +++ b/app/models/concerns/stif_netex_attributes_support.rb @@ -49,7 +49,7 @@ module StifNetexAttributesSupport end def provider_id - self.referential.workbench.organisation.name.parameterize + self.referential.workbench.organisation.name.parameterize.underscore end def boiv_id |