diff options
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/api/v1/lines/show.rabl | 4 | ||||
| -rw-r--r-- | app/views/lines/_form.html.slim | 2 | ||||
| -rw-r--r-- | app/views/referential_lines/_form.html.slim | 2 | ||||
| -rw-r--r-- | app/views/rule_parameter_sets/_form.html.slim | 2 | ||||
| -rw-r--r-- | app/views/rule_parameter_sets/show.html.slim | 2 | ||||
| -rw-r--r-- | app/views/shared/_lines_search_form.html.slim | 2 | ||||
| -rw-r--r-- | app/views/vehicle_journeys/_form.html.slim | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/app/views/api/v1/lines/show.rabl b/app/views/api/v1/lines/show.rabl index dcd497aa5..16a265dfe 100644 --- a/app/views/api/v1/lines/show.rabl +++ b/app/views/api/v1/lines/show.rabl @@ -1,6 +1,6 @@ object @line extends "api/v1/trident_objects/show" -[ :name, :number, :published_name, :transport_mode_name, :registration_number, :comment, :mobility_restricted_suitability].each do |attr| +[ :name, :number, :published_name, :transport_mode, :registration_number, :comment, :mobility_restricted_suitability].each do |attr| attributes attr, :unless => lambda { |m| m.send( attr).nil?} end @@ -9,6 +9,6 @@ node :network_short_description do |line| end unless root_object.network.nil? node :company_short_description do |line| - partial("api/v1/companies/short_description", :object => line.company) + partial("api/v1/companies/short_description", :object => line.company) end unless root_object.company.nil? diff --git a/app/views/lines/_form.html.slim b/app/views/lines/_form.html.slim index 6c847b275..cbb50ae28 100644 --- a/app/views/lines/_form.html.slim +++ b/app/views/lines/_form.html.slim @@ -6,7 +6,7 @@ = form.input :published_name = form.input :registration_number, :input_html => { :title => t("formtastic.titles#{format_restriction_for_locales(@line_referential)}.line.registration_number")} = form.input :number, :input_html => { :title => t("formtastic.titles#{format_restriction_for_locales(@line_referential)}.line.number") } - = form.input :transport_mode, as: :select, :collection => @line.line_referential.transport_modes, :include_blank => false, :member_label => Proc.new { |mode| t("transport_modes.label.#{mode}") } + = form.input :transport_mode, include_blank: false = form.input :color, as: :string = form.input :text_color = form.input :stable_id diff --git a/app/views/referential_lines/_form.html.slim b/app/views/referential_lines/_form.html.slim index 08a011017..ca90ef8c3 100644 --- a/app/views/referential_lines/_form.html.slim +++ b/app/views/referential_lines/_form.html.slim @@ -6,7 +6,7 @@ = form.input :published_name = form.input :registration_number, :input_html => { :title => t("formtastic.titles#{format_restriction_for_locales(@referential)}.line.registration_number") } = form.input :number, :input_html => { :title => t("formtastic.titles#{format_restriction_for_locales(@referential)}.line.number") } - = form.input :transport_mode, as: :select, :collection => @line.line_referential.transport_modes, :include_blank => false, :member_label => Proc.new { |mode| t("transport_modes.label.#{mode}") } + = form.input :transport_mode, include_blank: false = form.input :color, as: :string = form.input :text_color = form.input :stable_id diff --git a/app/views/rule_parameter_sets/_form.html.slim b/app/views/rule_parameter_sets/_form.html.slim index de3368a1b..b93caae58 100644 --- a/app/views/rule_parameter_sets/_form.html.slim +++ b/app/views/rule_parameter_sets/_form.html.slim @@ -36,7 +36,7 @@ tbody / To be removed, see #1936 - - Chouette::Line.transport_modes.map(&:to_s).each do |mode| + - Chouette::Line.transport_mode.values.each do |mode| tr == render partial: "mode_fields", :locals => { f: form, mode: mode } diff --git a/app/views/rule_parameter_sets/show.html.slim b/app/views/rule_parameter_sets/show.html.slim index af7ecb0a4..6adfeab89 100644 --- a/app/views/rule_parameter_sets/show.html.slim +++ b/app/views/rule_parameter_sets/show.html.slim @@ -96,7 +96,7 @@ - unless prefix == "allowed_transport" th = RuleParameterSet.human_attribute_name(prefix) / To be removed, see #1936 - - Chouette::Line.transport_modes.map(&:to_s).each do |mode| + - Chouette::Line.transport_mode.values.each do |mode| - if @rule_parameter_set.allowed(mode) tr td = t("transport_modes.label.#{mode}") diff --git a/app/views/shared/_lines_search_form.html.slim b/app/views/shared/_lines_search_form.html.slim index 30cdb1483..f7c3dc4ee 100644 --- a/app/views/shared/_lines_search_form.html.slim +++ b/app/views/shared/_lines_search_form.html.slim @@ -19,6 +19,6 @@ - options_container = (referential_type == 'referential' && filter == 'transport_modes') ? referential.line_referential : referential - if options_container && options_container.send(filter).any? - options = options_container.send(filter).collect { |f| [f.name, filter == 'transport_modes' ? f.name : f.id] }.unshift([t("lines.index.no_#{filter}"), -1]) - - matcher = filter == 'transport_modes' ? :transport_mode_name_eq : :"#{filter == 'group_of_lines' ? filter : filter.singularize}_id_eq" + - matcher = filter == 'transport_modes' ? :transport_mode_eq : :"#{filter == 'group_of_lines' ? filter : filter.singularize}_id_eq" .col-xs-3 = f.select(matcher, options, { include_blank: '' }, { class: 'form-control', style: 'width: 100%', 'data-select2ed': 'true', 'data-select2ed-placeholder': t("lines.index.all_#{filter}") }) diff --git a/app/views/vehicle_journeys/_form.html.slim b/app/views/vehicle_journeys/_form.html.slim index 61d6b0e06..c738b8b00 100644 --- a/app/views/vehicle_journeys/_form.html.slim +++ b/app/views/vehicle_journeys/_form.html.slim @@ -7,7 +7,7 @@ = form.input :published_journey_name = form.input :published_journey_identifier = form.input :comment - = form.input :transport_mode_name, as: :select, :collection => @line.line_referential.transport_modes, :include_blank => true, :member_label => Proc.new { |mode| t("transport_modes.label.#{mode}") } + = form.input :transport_mode, include_blank: false = form.input :mobility_restricted_suitability, as: :select, :collection => [[vehicle_journey.human_attribute_name("accessible"), true], [vehicle_journey.human_attribute_name("not_accessible"), false]], :include_blank => true = form.input :flexible_service, as: :select, :collection => [[vehicle_journey.human_attribute_name("on_demand_fs"), true], [vehicle_journey.human_attribute_name("regular_fs"), false]], :include_blank => true = form.input :status_value |