diff options
| author | Zog | 2018-05-07 08:26:07 +0200 |
|---|---|---|
| committer | Zog | 2018-05-07 08:26:07 +0200 |
| commit | 2c619e4aa072950681be04a603f91597dfcca088 (patch) | |
| tree | de55be1d147d24ba843a16e8d5a5a06a95b6f78b | |
| parent | 464b3ce20ecaf3c5e1a5cca6194b91b7eb920325 (diff) | |
| download | chouette-core-2c619e4aa072950681be04a603f91597dfcca088.tar.bz2 | |
refs #6923; small improvements
| -rw-r--r-- | app/services/referential_consolidated.rb | 4 | ||||
| -rw-r--r-- | app/views/referential_vehicle_journeys/_consolidated_line.html.slim | 6 | ||||
| -rw-r--r-- | app/views/referential_vehicle_journeys/_filters.html.slim | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/app/services/referential_consolidated.rb b/app/services/referential_consolidated.rb index abfb7532b..465eab405 100644 --- a/app/services/referential_consolidated.rb +++ b/app/services/referential_consolidated.rb @@ -89,7 +89,7 @@ class ReferentialConsolidated end def highlighted? - matching_stop_areas = params[:q]["stop_areas"] && (params[:q]["stop_areas"].values & self.stop_area_ids.map(&:to_s)).present? + matching_stop_areas = params[:q] && params[:q]["stop_areas"] && (params[:q]["stop_areas"].values & self.stop_area_ids.map(&:to_s)).present? (should_highlight? || matching_stop_areas) && highlighted_journeys.exists? end @@ -118,7 +118,7 @@ class ReferentialConsolidated def_delegators :ar_model, :id, :arrival_time, :departure_time, :name, :stop_area, :stop_area_id def highlighted? - params[:q]["stop_areas"] && params[:q]["stop_areas"].values.any?{|v| v.to_s == stop_area_id.to_s} + params[:q] && params[:q]["stop_areas"] && params[:q]["stop_areas"].values.any?{|v| v.to_s == stop_area_id.to_s} end end end diff --git a/app/views/referential_vehicle_journeys/_consolidated_line.html.slim b/app/views/referential_vehicle_journeys/_consolidated_line.html.slim index b72a17ccd..84c09313a 100644 --- a/app/views/referential_vehicle_journeys/_consolidated_line.html.slim +++ b/app/views/referential_vehicle_journeys/_consolidated_line.html.slim @@ -75,8 +75,10 @@ .t2e-item class="#{journey.highlighted? ? 'highlighted' : ''}" .th div - strong= link_to journey.id, [@referential, journey.route.line, journey.route] - div= journey.published_journey_name + strong= link_to journey.id, [@referential, journey.route.line, journey.route, :vehicle_journeys] + div + a title=journey.published_journey_name + = journey.published_journey_name div= journey.journey_pattern.get_objectid.short_id div - journey.purchase_windows[0..3].each do |tt| diff --git a/app/views/referential_vehicle_journeys/_filters.html.slim b/app/views/referential_vehicle_journeys/_filters.html.slim index b12766df1..0c4018808 100644 --- a/app/views/referential_vehicle_journeys/_filters.html.slim +++ b/app/views/referential_vehicle_journeys/_filters.html.slim @@ -82,5 +82,5 @@ .actions - = link_to t('actions.erase'), referential_vehicle_journeys_path(@referential), class: 'btn btn-link' + = link_to t('actions.erase'), referential_vehicle_journeys_path(@referential, display: params[:display]), class: 'btn btn-link' = f.submit t('actions.filter'), class: 'btn btn-default' |