Propose some improvements on CustomFields

1 files changed, 1 insertions, 15 deletions

diff --git a/app/models/chouette/vehicle_journey.rb b/app/models/chouette/vehicle_journey.rb
index 9b94f7f0e..c5a6901d7 100644
--- a/app/models/chouette/vehicle_journey.rb
+++ b/app/models/chouette/vehicle_journey.rb
@@ -3,6 +3,7 @@ module Chouette
   class VehicleJourney < Chouette::TridentActiveRecord
     has_paper_trail
     include ChecksumSupport
+    include CustomFieldsSupport
     include VehicleJourneyRestrictions
     include ObjectidSupport
     include StifTransportModeEnumerations
@@ -340,21 +341,6 @@ module Chouette
       end
     end
 
-    def self.custom_fields
-      CustomField.where(resource_type: self.name.split("::").last)
-    end
-
-
-    def custom_fields
-      Hash[*self.class.custom_fields.map do |v|
-        [v.code, v.slice(:code, :name, :field_type, :options).update(value: custom_field_value(v.code))]
-      end.flatten]
-    end
-
-    def custom_field_value key
-      (custom_field_values || {})[key.to_s]
-    end
-
     def self.matrix(vehicle_journeys)
       Hash[*VehicleJourneyAtStop.where(vehicle_journey_id: vehicle_journeys.pluck(:id)).map do |vjas|
         [ "#{vjas.vehicle_journey_id}-#{vjas.stop_point_id}", vjas]