Refs #6923; Use a feature: `consolidated_offers`

3 files changed, 9 insertions, 9 deletions

diff --git a/app/views/referential_vehicle_journeys/_consolidated_line.html.slim b/app/views/referential_vehicle_journeys/_consolidated_line.html.slim
index 84c09313a..f6a9dcee8 100644
--- a/app/views/referential_vehicle_journeys/_consolidated_line.html.slim
+++ b/app/views/referential_vehicle_journeys/_consolidated_line.html.slim
@@ -77,8 +77,7 @@
                     div
                       strong= link_to journey.id, [@referential, journey.route.line, journey.route, :vehicle_journeys]
                     div
-                      a title=journey.published_journey_name
-                        = journey.published_journey_name
+                      = link_to journey.published_journey_name, [@referential, journey.route.line, journey.route, :vehicle_journeys], title: 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 0c4018808..bcb980f64 100644
--- a/app/views/referential_vehicle_journeys/_filters.html.slim
+++ b/app/views/referential_vehicle_journeys/_filters.html.slim
@@ -10,12 +10,13 @@
     .form-group.per-page-select
       = I18n.t("simple_form.per_page")
       = %w(10 50 100).each_with_index.map{ |v, i| (params[:per_page] == v || params[:per_page].nil? && i == 0) ? "<span class='selected'>#{v}</span>" : link_to(v, referential_vehicle_journeys_path(@referential, q: params[:q], per_page: v)) }.join(' - ').html_safe
-    .form-group
-      .btn-group
-        = link_to referential_vehicle_journeys_path(@referential, q: params[:q], display: :list), class: 'btn btn-default ' + (params[:display] != "consolidated" ? 'active' : '') do
-          span.fa.fa-align-justify
-        = link_to referential_vehicle_journeys_path(@referential, q: params[:q], display: :consolidated), class: 'btn btn-default ' + (params[:display] == "consolidated" ? 'active' : '') do
-          span.fa.fa-th-large
+    - if has_feature?(:consolidated_offers)
+      .form-group
+        .btn-group
+          = link_to referential_vehicle_journeys_path(@referential, q: params[:q], display: :list), class: 'btn btn-default ' + (params[:display] != "consolidated" ? 'active' : '') do
+            span.fa.fa-align-justify
+          = link_to referential_vehicle_journeys_path(@referential, q: params[:q], display: :consolidated), class: 'btn btn-default ' + (params[:display] == "consolidated" ? 'active' : '') do
+            span.fa.fa-th-large
 
   .ffg-row
     .form-group.togglable class=filter_item_class(params[:q], :company_id_eq_any)
diff --git a/app/views/referential_vehicle_journeys/index.html.slim b/app/views/referential_vehicle_journeys/index.html.slim
index 178a88568..d1d1dae07 100644
--- a/app/views/referential_vehicle_journeys/index.html.slim
+++ b/app/views/referential_vehicle_journeys/index.html.slim
@@ -9,7 +9,7 @@
           = render 'filters'
 
     - if @vehicle_journeys.present?
-      - if params[:display] == "consolidated"
+      - if params[:display] == "consolidated" && has_feature?(:consolidated_offers)
         = render partial: "consolidated"
       - else
         = render partial: "list"