diff options
| -rw-r--r-- | app/models/chouette/company.rb | 2 | ||||
| -rw-r--r-- | app/models/chouette/group_of_line.rb | 2 | ||||
| -rw-r--r-- | app/models/chouette/network.rb | 2 | ||||
| -rw-r--r-- | app/models/chouette/trident_active_record.rb | 2 | ||||
| -rw-r--r-- | app/models/concerns/stif_netex_attributes_support.rb | 17 |
5 files changed, 12 insertions, 13 deletions
diff --git a/app/models/chouette/company.rb b/app/models/chouette/company.rb index 7b96e875e..c153a2d6b 100644 --- a/app/models/chouette/company.rb +++ b/app/models/chouette/company.rb @@ -1,6 +1,6 @@ class Chouette::Company < Chouette::ActiveRecord include CompanyRestrictions - include DefaultNetexAttributesSupport + include StifNetexAttributesSupport include LineReferentialSupport has_many :lines diff --git a/app/models/chouette/group_of_line.rb b/app/models/chouette/group_of_line.rb index d954c6699..40758c390 100644 --- a/app/models/chouette/group_of_line.rb +++ b/app/models/chouette/group_of_line.rb @@ -1,5 +1,5 @@ class Chouette::GroupOfLine < Chouette::ActiveRecord - include DefaultNetexAttributesSupport + include StifNetexAttributesSupport include GroupOfLineRestrictions include LineReferentialSupport diff --git a/app/models/chouette/network.rb b/app/models/chouette/network.rb index 690c39344..d710112f9 100644 --- a/app/models/chouette/network.rb +++ b/app/models/chouette/network.rb @@ -1,5 +1,5 @@ class Chouette::Network < Chouette::ActiveRecord - include DefaultNetexAttributesSupport + include StifNetexAttributesSupport include NetworkRestrictions include LineReferentialSupport # FIXME http://jira.codehaus.org/browse/JRUBY-6358 diff --git a/app/models/chouette/trident_active_record.rb b/app/models/chouette/trident_active_record.rb index c1bc0172b..e8223e3d6 100644 --- a/app/models/chouette/trident_active_record.rb +++ b/app/models/chouette/trident_active_record.rb @@ -1,5 +1,5 @@ class Chouette::TridentActiveRecord < Chouette::ActiveRecord - include DefaultAttributesSupport + include StifNetexAttributesSupport self.abstract_class = true diff --git a/app/models/concerns/stif_netex_attributes_support.rb b/app/models/concerns/stif_netex_attributes_support.rb index d4070fbc6..acacc27de 100644 --- a/app/models/concerns/stif_netex_attributes_support.rb +++ b/app/models/concerns/stif_netex_attributes_support.rb @@ -13,7 +13,7 @@ module StifNetexAttributesSupport end def objectid - Chouette::StifNetexObjectId.new read_attribute(:objectid) + Chouette::StifNetexObjectid.new read_attribute(:objectid) end def provider_id @@ -43,13 +43,12 @@ module StifNetexAttributesSupport end def increment_workbench_local_id - workbench_object_identifier = self.referential.workbench.worbench_object_identifiers.find_or_create_by_object_class(self.class) - result = WorbenchObjectIdentifier.increment_counter(:last_local_id, 1) - counter = 3 - # Ecrire le code pour répéter l'opération 3 fois au cas ou l'enregistrement échouerait. - while result == false && counter <= 3 - ..... - end + # workbench_object_identifier = self.referential.workbench.worbench_object_identifiers.find_or_create_by_object_class(self.class) + # result = WorbenchObjectIdentifier.increment_counter(:last_local_id, 1) + # counter = 3 + # # Ecrire le code pour répéter l'opération 3 fois au cas ou l'enregistrement échouerait. + # while result == false && counter <= 3 + # ..... + # end end - end |
