diff options
| -rw-r--r-- | app/models/compliance_control.rb | 1 | ||||
| -rw-r--r-- | app/models/generic_attribute_control/min_max.rb | 1 | ||||
| -rw-r--r-- | app/models/generic_attribute_control/pattern.rb | 1 | ||||
| -rw-r--r-- | app/models/generic_attribute_control/uniqueness.rb | 1 | ||||
| -rw-r--r-- | app/models/route_control/minimum_length.rb | 1 | ||||
| -rw-r--r-- | app/models/route_control/opposite_route.rb | 1 | ||||
| -rw-r--r-- | app/models/vehicle_journey_control/time_table.rb | 1 | ||||
| -rw-r--r-- | app/models/vehicle_journey_control/vehicle_journey_at_stops.rb | 1 | ||||
| -rw-r--r-- | app/views/compliance_controls/show.html.slim | 6 |
9 files changed, 7 insertions, 7 deletions
diff --git a/app/models/compliance_control.rb b/app/models/compliance_control.rb index baf491e8a..08efa7e9a 100644 --- a/app/models/compliance_control.rb +++ b/app/models/compliance_control.rb @@ -24,7 +24,6 @@ class ComplianceControl < ActiveRecord::Base end class << self - def default_criticity; :warning end def default_code; "" end def dynamic_attributes hstore_metadata_for_control_attributes.keys diff --git a/app/models/generic_attribute_control/min_max.rb b/app/models/generic_attribute_control/min_max.rb index a83ab64ab..ab6f546a7 100644 --- a/app/models/generic_attribute_control/min_max.rb +++ b/app/models/generic_attribute_control/min_max.rb @@ -9,7 +9,6 @@ module GenericAttributeControl class << self def attribute_type; :integer end - def default_criticity; :warning end def default_code; "3-Generic-2" end end end diff --git a/app/models/generic_attribute_control/pattern.rb b/app/models/generic_attribute_control/pattern.rb index 027d6948e..3a4a55d5c 100644 --- a/app/models/generic_attribute_control/pattern.rb +++ b/app/models/generic_attribute_control/pattern.rb @@ -7,7 +7,6 @@ module GenericAttributeControl class << self def attribute_type; :string end - def default_criticity; :warning end def default_code; "3-Generic-1" end end end diff --git a/app/models/generic_attribute_control/uniqueness.rb b/app/models/generic_attribute_control/uniqueness.rb index 36a270d74..f707c944b 100644 --- a/app/models/generic_attribute_control/uniqueness.rb +++ b/app/models/generic_attribute_control/uniqueness.rb @@ -6,7 +6,6 @@ module GenericAttributeControl class << self def attribute_type; :string end - def default_criticity; :warning end def default_code; "3-Generic-3" end end end diff --git a/app/models/route_control/minimum_length.rb b/app/models/route_control/minimum_length.rb index 56becfb2b..7aee4da21 100644 --- a/app/models/route_control/minimum_length.rb +++ b/app/models/route_control/minimum_length.rb @@ -1,5 +1,6 @@ module RouteControl class MinimumLength < ComplianceControl + enumerize :criticity, in: %i(error), scope: true, default: :error def self.default_code; "3-Route-6" end end diff --git a/app/models/route_control/opposite_route.rb b/app/models/route_control/opposite_route.rb index 0148087ca..3921bb0a2 100644 --- a/app/models/route_control/opposite_route.rb +++ b/app/models/route_control/opposite_route.rb @@ -1,5 +1,6 @@ module RouteControl class OppositeRoute < ComplianceControl + enumerize :criticity, in: %i(error), scope: true, default: :error def self.default_code; "3-Route-2" end end diff --git a/app/models/vehicle_journey_control/time_table.rb b/app/models/vehicle_journey_control/time_table.rb index 617ead12b..1e3166693 100644 --- a/app/models/vehicle_journey_control/time_table.rb +++ b/app/models/vehicle_journey_control/time_table.rb @@ -1,5 +1,6 @@ module VehicleJourneyControl class TimeTable < ComplianceControl + enumerize :criticity, in: %i(error), scope: true, default: :error def self.default_code; "3-VehicleJourney-4" end end diff --git a/app/models/vehicle_journey_control/vehicle_journey_at_stops.rb b/app/models/vehicle_journey_control/vehicle_journey_at_stops.rb index 47ee26f82..392e7764f 100644 --- a/app/models/vehicle_journey_control/vehicle_journey_at_stops.rb +++ b/app/models/vehicle_journey_control/vehicle_journey_at_stops.rb @@ -1,5 +1,6 @@ module VehicleJourneyControl class VehicleJourneyAtStops < ComplianceControl + enumerize :criticity, in: %i(error), scope: true, default: :error def self.default_code; "3-VehicleJourney-5" end end diff --git a/app/views/compliance_controls/show.html.slim b/app/views/compliance_controls/show.html.slim index 7f11b1041..12a28cd4b 100644 --- a/app/views/compliance_controls/show.html.slim +++ b/app/views/compliance_controls/show.html.slim @@ -1,8 +1,8 @@ / PageHeader -- header_params = ['jeux-de-controle', += pageheader 'jeux-de-controle', t('compliance_controls.show.title'), - ''] -= pageheader(*header_params) do + '', + link_to(t('actions.edit'), edit_compliance_control_set_compliance_control_path(params[:compliance_control_set_id], params[:id]), class: 'btn btn-default') do / PageContent .page_content |