From 1875caf7b065a05afc30bfc888cd642464580b27 Mon Sep 17 00:00:00 2001
From: Xinhui
Date: Wed, 18 Oct 2017 16:53:06 +0200
Subject: Disable call to legacy breadcrumb

---
 app/controllers/breadcrumb_controller.rb | 38 --------------------------------
 1 file changed, 38 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/breadcrumb_controller.rb b/app/controllers/breadcrumb_controller.rb
index cb639fdb8..8c350cbec 100644
--- a/app/controllers/breadcrumb_controller.rb
+++ b/app/controllers/breadcrumb_controller.rb
@@ -1,41 +1,3 @@
 class BreadcrumbController < InheritedResources::Base
   include Pundit
-  include BreadcrumbHelper
-
-  def show
-    show! do
-      build_breadcrumb :show
-    end
-  end
-
-  def index
-    index! do
-      build_breadcrumb :index
-    end
-  end
-
-  def edit
-    edit! do
-      build_breadcrumb :edit
-    end
-  end
-
-  def update
-    update! do |success, failure|
-      build_breadcrumb :edit
-    end
-  end
-
-  def new
-    new! do
-      build_breadcrumb :new
-    end
-  end
-
-  def create
-    create! do |success, failure|
-      build_breadcrumb :new
-    end
-  end
-
 end
-- 
cgit v1.2.3


From 00df5aa984a92adedfcb389dbd36d78a4de7488e Mon Sep 17 00:00:00 2001
From: Xinhui
Date: Wed, 18 Oct 2017 16:54:46 +0200
Subject: Remove legacy breadcrumb method in controllers

Refs #4741
---
 app/controllers/imports_controller.rb      | 11 -----------
 app/controllers/referentials_controller.rb |  3 ---
 app/controllers/time_tables_controller.rb  | 10 +---------
 app/controllers/workbenches_controller.rb  |  4 +---
 4 files changed, 2 insertions(+), 26 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/imports_controller.rb b/app/controllers/imports_controller.rb
index 3c52dc935..22fae24c2 100644
--- a/app/controllers/imports_controller.rb
+++ b/app/controllers/imports_controller.rb
@@ -13,8 +13,6 @@ class ImportsController < BreadcrumbController
       @import = @import.decorate(context: {
         workbench: @workbench
       })
-
-      build_breadcrumb :show
     end
   end
 
@@ -24,17 +22,8 @@ class ImportsController < BreadcrumbController
         if collection.out_of_bounds?
           redirect_to params.merge(:page => 1)
         end
-
         @imports = decorate_imports(@imports)
       }
-
-      build_breadcrumb :index
-    end
-  end
-
-  def new
-    new! do
-      build_breadcrumb :new
     end
   end
 
diff --git a/app/controllers/referentials_controller.rb b/app/controllers/referentials_controller.rb
index c8984076a..e4357e878 100644
--- a/app/controllers/referentials_controller.rb
+++ b/app/controllers/referentials_controller.rb
@@ -18,8 +18,6 @@ class ReferentialsController < BreadcrumbController
 
       if !!@referential.created_from_id
         format.html { redirect_to workbench_path(@referential.workbench) }
-      else
-        build_breadcrumb :new
       end
     end
   end
@@ -45,7 +43,6 @@ class ReferentialsController < BreadcrumbController
                :time_tables_count => resource.time_tables.count,
                :referential_id => resource.id}
       }
-      format.html { build_breadcrumb :show}
     end
   end
 
diff --git a/app/controllers/time_tables_controller.rb b/app/controllers/time_tables_controller.rb
index af74f635f..0c1769ad7 100644
--- a/app/controllers/time_tables_controller.rb
+++ b/app/controllers/time_tables_controller.rb
@@ -19,7 +19,6 @@ class TimeTablesController < ChouetteController
       @time_table = @time_table.decorate(context: {
         referential: @referential
       })
-      build_breadcrumb :show
     end
   end
 
@@ -30,9 +29,7 @@ class TimeTablesController < ChouetteController
 
   def new
     @autocomplete_items = ActsAsTaggableOn::Tag.all
-    new! do
-      build_breadcrumb :new
-    end
+    new!
   end
 
   def create
@@ -66,7 +63,6 @@ class TimeTablesController < ChouetteController
 
   def edit
     edit! do
-      build_breadcrumb :edit
       @autocomplete_items = ActsAsTaggableOn::Tag.all
     end
   end
@@ -89,8 +85,6 @@ class TimeTablesController < ChouetteController
         end
 
         @time_tables = decorate_time_tables(@time_tables)
-
-        build_breadcrumb :index
       }
 
       format.js {
@@ -101,8 +95,6 @@ class TimeTablesController < ChouetteController
 
   def duplicate
     @time_table = Chouette::TimeTable.find params[:id]
-    # prepare breadcrumb before prepare data for new timetable
-    build_breadcrumb :edit
     @time_table = @time_table.duplicate
     render :new
   end
diff --git a/app/controllers/workbenches_controller.rb b/app/controllers/workbenches_controller.rb
index e271007d6..fb3cce1ad 100644
--- a/app/controllers/workbenches_controller.rb
+++ b/app/controllers/workbenches_controller.rb
@@ -25,9 +25,7 @@ class WorkbenchesController < BreadcrumbController
         current_workbench_id: params[:id]
       }
     )
-    show! do
-      build_breadcrumb :show
-    end
+    show!
   end
 
   def delete_referentials
-- 
cgit v1.2.3


From afd105ce4582bdec42ca57d1f546a2f5491de7c2 Mon Sep 17 00:00:00 2001
From: Xinhui
Date: Thu, 19 Oct 2017 14:40:07 +0200
Subject: Breadcrum for compliance check sets

---
 app/controllers/compliance_check_sets_controller.rb   | 2 +-
 app/controllers/compliance_control_sets_controller.rb | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'app/controllers')

diff --git a/app/controllers/compliance_check_sets_controller.rb b/app/controllers/compliance_check_sets_controller.rb
index fce8dcc56..ce76914b1 100644
--- a/app/controllers/compliance_check_sets_controller.rb
+++ b/app/controllers/compliance_check_sets_controller.rb
@@ -18,4 +18,4 @@ class ComplianceCheckSetsController < BreadcrumbController
       }
     end
   end
-end
\ No newline at end of file
+end
diff --git a/app/controllers/compliance_control_sets_controller.rb b/app/controllers/compliance_control_sets_controller.rb
index 9de90c21c..d0e26ec74 100644
--- a/app/controllers/compliance_control_sets_controller.rb
+++ b/app/controllers/compliance_control_sets_controller.rb
@@ -3,6 +3,7 @@ class ComplianceControlSetsController < BreadcrumbController
   include RansackDateFilter
   before_action only: [:index] { set_date_time_params("updated_at", DateTime) }
   respond_to :html
+  belong_to :workbench
 
   def index
     index! do |format|
-- 
cgit v1.2.3


From 1ad159bffffc1116b27f4eb39f1631cf5f791d5a Mon Sep 17 00:00:00 2001
From: Xinhui
Date: Thu, 19 Oct 2017 15:34:31 +0200
Subject: Breadcrumb for compliance_control_sets

---
 app/controllers/compliance_control_sets_controller.rb | 1 -
 1 file changed, 1 deletion(-)

(limited to 'app/controllers')

diff --git a/app/controllers/compliance_control_sets_controller.rb b/app/controllers/compliance_control_sets_controller.rb
index d0e26ec74..9de90c21c 100644
--- a/app/controllers/compliance_control_sets_controller.rb
+++ b/app/controllers/compliance_control_sets_controller.rb
@@ -3,7 +3,6 @@ class ComplianceControlSetsController < BreadcrumbController
   include RansackDateFilter
   before_action only: [:index] { set_date_time_params("updated_at", DateTime) }
   respond_to :html
-  belong_to :workbench
 
   def index
     index! do |format|
-- 
cgit v1.2.3


From a8f4fbe9d16984fbdf2cd769b7abe4f442b56688 Mon Sep 17 00:00:00 2001
From: Xinhui
Date: Thu, 19 Oct 2017 16:45:19 +0200
Subject: Breadcrumb for line_referential - stop_area_referential - companies

---
 app/controllers/companies_controller.rb | 2 --
 1 file changed, 2 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/companies_controller.rb b/app/controllers/companies_controller.rb
index cf27c39cf..e5d73e95f 100644
--- a/app/controllers/companies_controller.rb
+++ b/app/controllers/companies_controller.rb
@@ -22,8 +22,6 @@ class CompaniesController < BreadcrumbController
       format.json {
         @companies = decorate_companies(@companies)
       }
-
-      build_breadcrumb :index
     end
   end
 
-- 
cgit v1.2.3


From 5d9793a52fcdf3009e247eeaace4cdd31f33b45a Mon Sep 17 00:00:00 2001
From: Xinhui
Date: Thu, 19 Oct 2017 17:00:17 +0200
Subject: Breadcrumb for lines - networks

---
 app/controllers/lines_controller.rb    | 3 ---
 app/controllers/networks_controller.rb | 4 ----
 2 files changed, 7 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/lines_controller.rb b/app/controllers/lines_controller.rb
index 4b6448ce8..544d56e64 100644
--- a/app/controllers/lines_controller.rb
+++ b/app/controllers/lines_controller.rb
@@ -26,7 +26,6 @@ class LinesController < BreadcrumbController
         if collection.out_of_bounds?
           redirect_to params.merge(:page => 1)
         end
-        build_breadcrumb :index
       }
     end
   end
@@ -38,8 +37,6 @@ class LinesController < BreadcrumbController
         line_referential: @line_referential,
         current_organisation: current_organisation
       })
-
-      build_breadcrumb :show
     end
   end
 
diff --git a/app/controllers/networks_controller.rb b/app/controllers/networks_controller.rb
index 5dae1ba3f..363e56829 100644
--- a/app/controllers/networks_controller.rb
+++ b/app/controllers/networks_controller.rb
@@ -17,8 +17,6 @@ class NetworksController < BreadcrumbController
       @network = @network.decorate(context: {
         line_referential: line_referential
       })
-
-      build_breadcrumb :show
     end
   end
 
@@ -43,8 +41,6 @@ class NetworksController < BreadcrumbController
       format.js {
         @networks = decorate_networks(@networks)
       }
-
-      build_breadcrumb :index
     end
   end
 
-- 
cgit v1.2.3


From 5b0d0dfb9c4ae6c45a34fcbee224f1483ff4401b Mon Sep 17 00:00:00 2001
From: Xinhui
Date: Fri, 20 Oct 2017 11:14:03 +0200
Subject: Breadcrumb for group_of_lines

---
 app/controllers/group_of_lines_controller.rb | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/group_of_lines_controller.rb b/app/controllers/group_of_lines_controller.rb
index 5cadd40d3..0553ba482 100644
--- a/app/controllers/group_of_lines_controller.rb
+++ b/app/controllers/group_of_lines_controller.rb
@@ -13,9 +13,7 @@ class GroupOfLinesController < BreadcrumbController
   def show
     @map = GroupOfLineMap.new(resource).with_helpers(self)
     @lines = resource.lines.order(:name)
-    show! do
-      build_breadcrumb :show
-    end
+    show!
   end
 
   def index
@@ -24,7 +22,6 @@ class GroupOfLinesController < BreadcrumbController
         if collection.out_of_bounds?
           redirect_to params.merge(:page => 1)
         end
-        build_breadcrumb :index
       }
     end
   end
-- 
cgit v1.2.3


From 4b1327518597ac057e03e7670fb2e1fc75974c36 Mon Sep 17 00:00:00 2001
From: Xinhui
Date: Fri, 20 Oct 2017 11:19:24 +0200
Subject: Breadcrumb for calendars

---
 app/controllers/calendars_controller.rb | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/calendars_controller.rb b/app/controllers/calendars_controller.rb
index 1c342c718..66eb3f963 100644
--- a/app/controllers/calendars_controller.rb
+++ b/app/controllers/calendars_controller.rb
@@ -8,16 +8,12 @@ class CalendarsController < BreadcrumbController
   def index
     index! do
       @calendars = ModelDecorator.decorate(@calendars, with: CalendarDecorator)
-
-      build_breadcrumb :index
     end
   end
 
   def show
     show! do
       @calendar = @calendar.decorate
-
-      build_breadcrumb :show
     end
   end
 
-- 
cgit v1.2.3


From 8d59f83d7e0cc84f44101d8ad4b9d0d9f452df9a Mon Sep 17 00:00:00 2001
From: Xinhui
Date: Fri, 20 Oct 2017 11:59:50 +0200
Subject: Breadcrumb for referential_lines - routing_constraint_zones

---
 app/controllers/referential_lines_controller.rb        | 2 --
 app/controllers/routing_constraint_zones_controller.rb | 4 ----
 2 files changed, 6 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/referential_lines_controller.rb b/app/controllers/referential_lines_controller.rb
index ec0bbbb18..b9f8c0050 100644
--- a/app/controllers/referential_lines_controller.rb
+++ b/app/controllers/referential_lines_controller.rb
@@ -44,8 +44,6 @@ class ReferentialLinesController < ChouetteController
           current_organisation: current_organisation
         }
       )
-
-      build_breadcrumb :show
     end
   end
 
diff --git a/app/controllers/routing_constraint_zones_controller.rb b/app/controllers/routing_constraint_zones_controller.rb
index 78cd0e209..6c3da5980 100644
--- a/app/controllers/routing_constraint_zones_controller.rb
+++ b/app/controllers/routing_constraint_zones_controller.rb
@@ -20,8 +20,6 @@ class RoutingConstraintZonesController < ChouetteController
           line: parent
         }
       )
-
-      build_breadcrumb :index
     end
   end
 
@@ -31,8 +29,6 @@ class RoutingConstraintZonesController < ChouetteController
         referential: referential,
         line: parent
       })
-
-      build_breadcrumb :show
     end
   end
 
-- 
cgit v1.2.3


From bdeb36005106c099ee3fa831604082ef9df2f27c Mon Sep 17 00:00:00 2001
From: Xinhui
Date: Fri, 20 Oct 2017 14:51:08 +0200
Subject: Breadcrumb for routes

---
 app/controllers/routes_controller.rb | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/routes_controller.rb b/app/controllers/routes_controller.rb
index 78daffb30..93f30f4d5 100644
--- a/app/controllers/routes_controller.rb
+++ b/app/controllers/routes_controller.rb
@@ -19,7 +19,6 @@ class RoutesController < ChouetteController
 
   def edit_boarding_alighting
     @route = route
-    build_breadcrumb :edit
   end
 
   def save_boarding_alighting
@@ -51,8 +50,6 @@ class RoutesController < ChouetteController
         @route_sp,
         with: StopPointDecorator
       )
-
-      build_breadcrumb :show
     end
   end
 
-- 
cgit v1.2.3


From fccf690adb8769dc5050fa231a961b5e48146848 Mon Sep 17 00:00:00 2001
From: Xinhui
Date: Fri, 20 Oct 2017 15:02:35 +0200
Subject: Breadcrumb for journey_patterns

---
 app/controllers/journey_patterns_collections_controller.rb | 1 -
 1 file changed, 1 deletion(-)

(limited to 'app/controllers')

diff --git a/app/controllers/journey_patterns_collections_controller.rb b/app/controllers/journey_patterns_collections_controller.rb
index e8924b7ad..546158fa8 100644
--- a/app/controllers/journey_patterns_collections_controller.rb
+++ b/app/controllers/journey_patterns_collections_controller.rb
@@ -45,7 +45,6 @@ class JourneyPatternsCollectionsController < ChouetteController
       }
     end
     @stop_points_list = @stop_points_list.sort_by {|a| a[:position] }
-    build_breadcrumb :index
   end
 
   def user_permissions
-- 
cgit v1.2.3


From 3d1a9601cac27dfb6b74c5f53e9042c246296928 Mon Sep 17 00:00:00 2001
From: Xinhui
Date: Fri, 20 Oct 2017 15:37:43 +0200
Subject: Breadcrumb for referential_stop_areas

---
 app/controllers/referential_stop_areas_controller.rb | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/referential_stop_areas_controller.rb b/app/controllers/referential_stop_areas_controller.rb
index 7519418e7..78dcd6dd9 100644
--- a/app/controllers/referential_stop_areas_controller.rb
+++ b/app/controllers/referential_stop_areas_controller.rb
@@ -14,31 +14,26 @@ class ReferentialStopAreasController  < ChouetteController
   def select_parent
     @stop_area = stop_area
     @parent = stop_area.parent
-    build_breadcrumb :edit
   end
 
   def add_children
     @stop_area = stop_area
     @children = stop_area.children
-    build_breadcrumb :edit
   end
 
   def add_routing_lines
     @stop_area = stop_area
     @lines = stop_area.routing_lines
-    build_breadcrumb :edit
   end
 
   def add_routing_stops
     @stop_area = stop_area
-    build_breadcrumb :edit
   end
 
   def access_links
     @stop_area = stop_area
     @generic_access_links = stop_area.generic_access_link_matrix
     @detail_access_links = stop_area.detail_access_link_matrix
-    build_breadcrumb :edit
   end
 
   def index
@@ -49,7 +44,6 @@ class ReferentialStopAreasController  < ChouetteController
         if collection.out_of_bounds?
           redirect_to params.merge(:page => 1)
         end
-        build_breadcrumb :index
       }
     end
   end
@@ -57,9 +51,7 @@ class ReferentialStopAreasController  < ChouetteController
   def new
     @map = StopAreaMap.new( Chouette::StopArea.new).with_helpers(self)
     @map.editable = true
-    new! do
-      build_breadcrumb :show
-    end
+    new!
   end
 
   def create
@@ -81,8 +73,6 @@ class ReferentialStopAreasController  < ChouetteController
       end
 
       @stop_area = @stop_area.decorate
-
-      build_breadcrumb :show
     end
   end
 
@@ -90,7 +80,6 @@ class ReferentialStopAreasController  < ChouetteController
     edit! do
       stop_area.position ||= stop_area.default_position
       map.editable = true
-      build_breadcrumb :edit
    end
   end
 
-- 
cgit v1.2.3


From 2242858aa56a818f936a905b5b9e5f90926b725c Mon Sep 17 00:00:00 2001
From: Xinhui
Date: Fri, 20 Oct 2017 16:45:21 +0200
Subject: Breadcrumb for vehicle_journeys

---
 app/controllers/vehicle_journeys_controller.rb | 1 -
 1 file changed, 1 deletion(-)

(limited to 'app/controllers')

diff --git a/app/controllers/vehicle_journeys_controller.rb b/app/controllers/vehicle_journeys_controller.rb
index 70cca15ed..050f2f219 100644
--- a/app/controllers/vehicle_journeys_controller.rb
+++ b/app/controllers/vehicle_journeys_controller.rb
@@ -76,7 +76,6 @@ class VehicleJourneysController < ChouetteController
       if collection.out_of_bounds?
         redirect_to params.merge(:page => 1)
       end
-      build_breadcrumb :index
     end
   end
 
-- 
cgit v1.2.3


From 1237184240df2fedf232a80bfcf7edc818eb3c5e Mon Sep 17 00:00:00 2001
From: Xinhui
Date: Wed, 25 Oct 2017 11:46:21 +0200
Subject: Breadcrumb for stop_areas - referential_companies

---
 app/controllers/referential_companies_controller.rb |  2 --
 app/controllers/stop_areas_controller.rb            | 14 +-------------
 2 files changed, 1 insertion(+), 15 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/referential_companies_controller.rb b/app/controllers/referential_companies_controller.rb
index 482f74ea0..fdbd83dc9 100644
--- a/app/controllers/referential_companies_controller.rb
+++ b/app/controllers/referential_companies_controller.rb
@@ -20,8 +20,6 @@ class ReferentialCompaniesController < ChouetteController
       format.js {
         @companies = decorate_companies(@companies)
       }
-
-      build_breadcrumb :index
     end
   end
 
diff --git a/app/controllers/stop_areas_controller.rb b/app/controllers/stop_areas_controller.rb
index cdb7c59ab..18ea33936 100644
--- a/app/controllers/stop_areas_controller.rb
+++ b/app/controllers/stop_areas_controller.rb
@@ -22,32 +22,27 @@ class StopAreasController < BreadcrumbController
   def select_parent
     @stop_area = stop_area
     @parent = stop_area.parent
-    build_breadcrumb :edit
   end
 
   def add_children
     authorize stop_area
     @stop_area = stop_area
     @children = stop_area.children
-    build_breadcrumb :edit
   end
 
   def add_routing_lines
     @stop_area = stop_area
     @lines = stop_area.routing_lines
-    build_breadcrumb :edit
   end
 
   def add_routing_stops
     @stop_area = stop_area
-    build_breadcrumb :edit
   end
 
   def access_links
     @stop_area = stop_area
     @generic_access_links = stop_area.generic_access_link_matrix
     @detail_access_links = stop_area.detail_access_link_matrix
-    build_breadcrumb :edit
   end
 
   def index
@@ -64,8 +59,6 @@ class StopAreasController < BreadcrumbController
           @stop_areas,
           with: StopAreaDecorator
         )
-
-        build_breadcrumb :index
       }
     end
   end
@@ -74,9 +67,7 @@ class StopAreasController < BreadcrumbController
     authorize resource_class
     @map = StopAreaMap.new( Chouette::StopArea.new).with_helpers(self)
     @map.editable = true
-    new! do
-      build_breadcrumb :show
-    end
+    new!
   end
 
   def create
@@ -99,8 +90,6 @@ class StopAreasController < BreadcrumbController
       end
 
       @stop_area = @stop_area.decorate
-
-      build_breadcrumb :show
     end
   end
 
@@ -109,7 +98,6 @@ class StopAreasController < BreadcrumbController
     edit! do
       stop_area.position ||= stop_area.default_position
       map.editable = true
-      build_breadcrumb :edit
    end
   end
 
-- 
cgit v1.2.3


From 6ecea55476e5a96124081e3e56493feb7e6ebd37 Mon Sep 17 00:00:00 2001
From: Xinhui
Date: Wed, 25 Oct 2017 11:53:56 +0200
Subject: Breadcrumb for referential_networks

---
 app/controllers/referential_networks_controller.rb | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/referential_networks_controller.rb b/app/controllers/referential_networks_controller.rb
index ee2db8008..2131b8e57 100644
--- a/app/controllers/referential_networks_controller.rb
+++ b/app/controllers/referential_networks_controller.rb
@@ -18,8 +18,6 @@ class ReferentialNetworksController < ChouetteController
           referential: referential
         }
       )
-
-      build_breadcrumb :show
     end
   end
 
@@ -36,8 +34,6 @@ class ReferentialNetworksController < ChouetteController
       format.js {
         @networks = decorate_networks(@networks)
       }
-
-      build_breadcrumb :index
     end
   end
 
-- 
cgit v1.2.3


From b7a4ff1063832600fd207a42fbe9eaaef761e7b4 Mon Sep 17 00:00:00 2001
From: Xinhui
Date: Wed, 25 Oct 2017 12:02:09 +0200
Subject: Breadcrumb for referential_group_of_lines

---
 app/controllers/referential_group_of_lines_controller.rb | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/referential_group_of_lines_controller.rb b/app/controllers/referential_group_of_lines_controller.rb
index 73520d00a..d88daab84 100644
--- a/app/controllers/referential_group_of_lines_controller.rb
+++ b/app/controllers/referential_group_of_lines_controller.rb
@@ -12,9 +12,7 @@ class ReferentialGroupOfLinesController < ChouetteController
   def show
     @map = GroupOfLineMap.new(resource).with_helpers(self)
     @lines = resource.lines.order(:name)
-    show! do
-      build_breadcrumb :show
-    end
+    show!
   end
 
   def index
@@ -23,7 +21,6 @@ class ReferentialGroupOfLinesController < ChouetteController
         if collection.out_of_bounds?
           redirect_to params.merge(:page => 1)
         end
-        build_breadcrumb :index
       }
     end
   end
-- 
cgit v1.2.3


From a83fbdaab1c9a6c73badf3e25dcfab8701d555b5 Mon Sep 17 00:00:00 2001
From: Xinhui
Date: Wed, 25 Oct 2017 12:19:57 +0200
Subject: Breadcrumb for route_section

---
 app/controllers/route_sections_controller.rb | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/route_sections_controller.rb b/app/controllers/route_sections_controller.rb
index c1aaf732e..03d6cf176 100644
--- a/app/controllers/route_sections_controller.rb
+++ b/app/controllers/route_sections_controller.rb
@@ -8,14 +8,9 @@ class RouteSectionsController < ChouetteController
   belongs_to :referential
 
   before_action :save_return_to_path, only: [:edit, :create_to_edit]
-  before_action ->(controller) { build_breadcrumb controller.action_name }
 
   helper_method :search
 
-  def index
-    index!
-  end
-
   def new
     @stop_areas = referential.stop_areas.with_geometry.order :name
     new!
-- 
cgit v1.2.3


From 118d1ae0c7ed66f408c5e260126ee553feda57a4 Mon Sep 17 00:00:00 2001
From: Xinhui
Date: Wed, 25 Oct 2017 12:23:14 +0200
Subject: Remove method build_breadcrumb

---
 app/controllers/access_links_controller.rb        | 16 ++++------------
 app/controllers/access_points_controller.rb       |  6 +-----
 app/controllers/connection_links_controller.rb    |  6 +-----
 app/controllers/exports_controller.rb             | 16 ++++++----------
 app/controllers/import_resources_controller.rb    |  2 --
 app/controllers/journey_patterns_controller.rb    |  4 +---
 app/controllers/line_footnotes_controller.rb      |  6 ------
 app/controllers/rule_parameter_sets_controller.rb |  6 ++----
 8 files changed, 15 insertions(+), 47 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/access_links_controller.rb b/app/controllers/access_links_controller.rb
index 6f1ad8bfd..936b8ea5e 100644
--- a/app/controllers/access_links_controller.rb
+++ b/app/controllers/access_links_controller.rb
@@ -21,9 +21,7 @@ class AccessLinksController < ChouetteController
     @access_point = Chouette::AccessPoint.find(params[:access_point_id])
     #@access_link = Chouette::AccessLink.find(params[:id])
     @stop_area = @access_link.stop_area
-    show! do |format|
-      format.html {build_breadcrumb :show}
-    end
+    show!
   end
 
   def new
@@ -41,9 +39,7 @@ class AccessLinksController < ChouetteController
       data[:name] = name
     end
     @access_link = Chouette::AccessLink.new(data.permit!)
-    new! do
-      build_breadcrumb :new
-    end
+    new!
   end
 
   def create
@@ -59,9 +55,7 @@ class AccessLinksController < ChouetteController
     @access_link = Chouette::AccessLink.find(params[:id])
     @stop_area = @access_link.stop_area
     @orientation = @access_link.link_orientation_type
-    edit! do
-      build_breadcrumb :edit
-    end
+    edit!
   end
 
   def update
@@ -69,9 +63,7 @@ class AccessLinksController < ChouetteController
     @access_link = Chouette::AccessLink.find(params[:id])
     @stop_area = @access_link.stop_area
     @orientation = @access_link.link_orientation_type
-    update! do |success, failure|
-      build_breadcrumb :edit
-    end
+    update!
   end
 
   protected
diff --git a/app/controllers/access_points_controller.rb b/app/controllers/access_points_controller.rb
index d43880c0b..477875cc9 100644
--- a/app/controllers/access_points_controller.rb
+++ b/app/controllers/access_points_controller.rb
@@ -6,7 +6,6 @@ class AccessPointsController < ChouetteController
   end
 
   respond_to :html, :kml, :xml, :json
-
   include PolicyChecker
 
   def index
@@ -32,7 +31,6 @@ class AccessPointsController < ChouetteController
         }
 
       end
-      format.html {build_breadcrumb :show}
     end
   end
 
@@ -40,9 +38,7 @@ class AccessPointsController < ChouetteController
   def edit
     access_point.position ||= access_point.default_position
     map.editable = true
-    edit! do
-      build_breadcrumb :edit
-    end
+    edit!
   end
 
 
diff --git a/app/controllers/connection_links_controller.rb b/app/controllers/connection_links_controller.rb
index 403f0ed9e..b56450291 100644
--- a/app/controllers/connection_links_controller.rb
+++ b/app/controllers/connection_links_controller.rb
@@ -18,23 +18,19 @@ class ConnectionLinksController < ChouetteController
         if collection.out_of_bounds?
           redirect_to params.merge(:page => 1)
         end
-        build_breadcrumb :index
       }
     end
   end
 
   def show
     @map = ConnectionLinkMap.new(resource).with_helpers(self)
-    show! do
-        build_breadcrumb :show
-    end
+    show!
   end
 
   def select_areas
     @connection_link = connection_link
     @departure = connection_link.departure
     @arrival = connection_link.arrival
-    build_breadcrumb :show
   end
 
   protected
diff --git a/app/controllers/exports_controller.rb b/app/controllers/exports_controller.rb
index 2cfa0b6fa..ad88c6dae 100644
--- a/app/controllers/exports_controller.rb
+++ b/app/controllers/exports_controller.rb
@@ -3,16 +3,14 @@ require 'open-uri'
 
 class ExportsController < ChouetteController
   defaults :resource_class => Export
-  
+
   respond_to :html, :only => [:show, :index, :destroy, :exported_file]
   respond_to :js, :only => [:index]
   belongs_to :referential
 
   def index
     begin
-      index! do 
-        build_breadcrumb :index
-      end
+      index!
     rescue Ievkit::Error, Faraday::Error => error
       logger.error("Iev failure : #{error.message}")
       flash[:error] = t(error.locale_for_error)
@@ -22,9 +20,7 @@ class ExportsController < ChouetteController
 
   def show
     begin
-      show! do 
-        build_breadcrumb :show
-      end
+      show!
     rescue Ievkit::Error, Faraday::Error => error
       logger.error("Iev failure : #{error.message}")
       flash[:error] = t(error.locale_for_error)
@@ -32,7 +28,7 @@ class ExportsController < ChouetteController
     end
   end
 
-  def destroy    
+  def destroy
     begin
       destroy!
     rescue Ievkit::Error, Faraday::Error => error
@@ -57,11 +53,11 @@ class ExportsController < ChouetteController
   end
 
   protected
-  
+
   def export_service
     ExportService.new(@referential)
   end
-  
+
   def resource
     @export ||= export_service.find( params[:id] )
     @line_items = @export.report.line_items
diff --git a/app/controllers/import_resources_controller.rb b/app/controllers/import_resources_controller.rb
index ac3dd042e..aee14d450 100644
--- a/app/controllers/import_resources_controller.rb
+++ b/app/controllers/import_resources_controller.rb
@@ -8,8 +8,6 @@ class ImportResourcesController < BreadcrumbController
       format.html {
         @import_resources = decorate_import_resources(@import_resources)
       }
-
-      build_breadcrumb :index
     end
   end
 
diff --git a/app/controllers/journey_patterns_controller.rb b/app/controllers/journey_patterns_controller.rb
index f4ae55b4e..a72e7da7f 100644
--- a/app/controllers/journey_patterns_controller.rb
+++ b/app/controllers/journey_patterns_controller.rb
@@ -30,9 +30,7 @@ class JourneyPatternsController < ChouetteController
   def show
     @map = JourneyPatternMap.new(journey_pattern).with_helpers(self)
     @stop_points = journey_pattern.stop_points.paginate(:page => params[:page])
-    show! do
-      build_breadcrumb :show
-    end
+    show!
   end
 
   def new_vehicle_journey
diff --git a/app/controllers/line_footnotes_controller.rb b/app/controllers/line_footnotes_controller.rb
index 581c921e8..2d4d10064 100644
--- a/app/controllers/line_footnotes_controller.rb
+++ b/app/controllers/line_footnotes_controller.rb
@@ -5,12 +5,6 @@ class LineFootnotesController < ChouetteController
   before_action :authorize_resource, only: [:destroy_footnote, :edit_footnote, :show_footnote, :update_footnote]
   before_action :authorize_resource_class, only: [:create_footnote, :index_footnote, :new_footnote]
 
-  def edit
-    edit! do
-      build_breadcrumb :edit
-    end
-  end
-
   def update
     update! do |success, failure|
       success.html { redirect_to referential_line_footnotes_path(@referential, @line) , notice: t('notice.footnotes.updated') }
diff --git a/app/controllers/rule_parameter_sets_controller.rb b/app/controllers/rule_parameter_sets_controller.rb
index 6a23407d0..7ab3cca23 100644
--- a/app/controllers/rule_parameter_sets_controller.rb
+++ b/app/controllers/rule_parameter_sets_controller.rb
@@ -5,11 +5,9 @@ class RuleParameterSetsController < BreadcrumbController
 
   def new
     @rule_parameter_set = RuleParameterSet.default( current_organisation)
-    new! do
-      build_breadcrumb :new
-    end
+    new!
   end
-  
+
   def destroy
     if current_organisation.rule_parameter_sets.count == 1
       flash[:alert] = t('rule_parameter_sets.destroy.last_rps_protected')
-- 
cgit v1.2.3


From f2593e299db59552ee47400622cd9cc77cc3a8d1 Mon Sep 17 00:00:00 2001
From: Xinhui
Date: Wed, 25 Oct 2017 14:42:23 +0200
Subject: Breadcrumb for timebands

---
 app/controllers/timebands_controller.rb | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/timebands_controller.rb b/app/controllers/timebands_controller.rb
index 446255cac..765557193 100644
--- a/app/controllers/timebands_controller.rb
+++ b/app/controllers/timebands_controller.rb
@@ -6,14 +6,7 @@ class TimebandsController < ChouetteController
 
   belongs_to :referential
 
-  def new
-    new! do
-      build_breadcrumb :new
-    end
-  end
-
   private
-
   def timeband_params
     params.require(:timeband).permit( :name, :start_time, :end_time )
   end
-- 
cgit v1.2.3


From 0947fea02efce26c8c8d13bc99a5341ec7a20c66 Mon Sep 17 00:00:00 2001
From: Xinhui
Date: Wed, 25 Oct 2017 15:55:36 +0200
Subject: Remove build_breadcrumb call

---
 app/controllers/vehicle_journey_imports_controller.rb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/vehicle_journey_imports_controller.rb b/app/controllers/vehicle_journey_imports_controller.rb
index 2e2a3a718..58f8816aa 100644
--- a/app/controllers/vehicle_journey_imports_controller.rb
+++ b/app/controllers/vehicle_journey_imports_controller.rb
@@ -12,9 +12,7 @@ class VehicleJourneyImportsController < ChouetteController
 
   def new
     @vehicle_journey_import = VehicleJourneyImport.new(:route => route)
-    new! do
-      build_breadcrumb :new
-    end
+    new!
   end
 
   def create
-- 
cgit v1.2.3


From 68bc446c975ff07cf2b4eb9f695da2dce93ee63d Mon Sep 17 00:00:00 2001
From: Xinhui
Date: Thu, 26 Oct 2017 11:51:07 +0200
Subject: Remove breadcrumb_controller

---
 app/controllers/api_keys_controller.rb                  | 2 +-
 app/controllers/breadcrumb_controller.rb                | 3 ---
 app/controllers/calendars_controller.rb                 | 2 +-
 app/controllers/chouette_controller.rb                  | 2 +-
 app/controllers/companies_controller.rb                 | 2 +-
 app/controllers/compliance_check_sets_controller.rb     | 2 +-
 app/controllers/compliance_control_blocks_controller.rb | 4 ++--
 app/controllers/compliance_control_sets_controller.rb   | 2 +-
 app/controllers/compliance_controls_controller.rb       | 2 +-
 app/controllers/concerns/policy_checker.rb              | 1 +
 app/controllers/dashboards_controller.rb                | 2 +-
 app/controllers/group_of_lines_controller.rb            | 2 +-
 app/controllers/import_messages_controller.rb           | 2 +-
 app/controllers/import_resources_controller.rb          | 2 +-
 app/controllers/imports_controller.rb                   | 2 +-
 app/controllers/line_referentials_controller.rb         | 2 +-
 app/controllers/lines_controller.rb                     | 2 +-
 app/controllers/networks_controller.rb                  | 2 +-
 app/controllers/organisations_controller.rb             | 4 ++--
 app/controllers/referentials_controller.rb              | 2 +-
 app/controllers/rule_parameter_sets_controller.rb       | 2 +-
 app/controllers/stop_area_referentials_controller.rb    | 2 +-
 app/controllers/stop_areas_controller.rb                | 2 +-
 app/controllers/users_controller.rb                     | 2 +-
 app/controllers/workbenches_controller.rb               | 2 +-
 25 files changed, 26 insertions(+), 28 deletions(-)
 delete mode 100644 app/controllers/breadcrumb_controller.rb

(limited to 'app/controllers')

diff --git a/app/controllers/api_keys_controller.rb b/app/controllers/api_keys_controller.rb
index 7ae8d4732..eebad5e7b 100644
--- a/app/controllers/api_keys_controller.rb
+++ b/app/controllers/api_keys_controller.rb
@@ -1,4 +1,4 @@
-class ApiKeysController < BreadcrumbController
+class ApiKeysController < InheritedResources::Base
   defaults resource_class: Api::V1::ApiKey
   include PolicyChecker
 
diff --git a/app/controllers/breadcrumb_controller.rb b/app/controllers/breadcrumb_controller.rb
deleted file mode 100644
index 8c350cbec..000000000
--- a/app/controllers/breadcrumb_controller.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-class BreadcrumbController < InheritedResources::Base
-  include Pundit
-end
diff --git a/app/controllers/calendars_controller.rb b/app/controllers/calendars_controller.rb
index 66eb3f963..e9ee7579a 100644
--- a/app/controllers/calendars_controller.rb
+++ b/app/controllers/calendars_controller.rb
@@ -1,4 +1,4 @@
-class CalendarsController < BreadcrumbController
+class CalendarsController < InheritedResources::Base
   include PolicyChecker
   defaults resource_class: Calendar
   before_action :ransack_contains_date, only: [:index]
diff --git a/app/controllers/chouette_controller.rb b/app/controllers/chouette_controller.rb
index dc9ab4fa5..cf7735624 100644
--- a/app/controllers/chouette_controller.rb
+++ b/app/controllers/chouette_controller.rb
@@ -1,4 +1,4 @@
-class ChouetteController < BreadcrumbController
+class ChouetteController < InheritedResources::Base
 
   include ApplicationHelper
   include BreadcrumbHelper
diff --git a/app/controllers/companies_controller.rb b/app/controllers/companies_controller.rb
index e5d73e95f..bc5bedd7f 100644
--- a/app/controllers/companies_controller.rb
+++ b/app/controllers/companies_controller.rb
@@ -1,4 +1,4 @@
-class CompaniesController < BreadcrumbController
+class CompaniesController < InheritedResources::Base
   include ApplicationHelper
   include PolicyChecker
   defaults :resource_class => Chouette::Company
diff --git a/app/controllers/compliance_check_sets_controller.rb b/app/controllers/compliance_check_sets_controller.rb
index ce76914b1..95dcfbf05 100644
--- a/app/controllers/compliance_check_sets_controller.rb
+++ b/app/controllers/compliance_check_sets_controller.rb
@@ -1,4 +1,4 @@
-class ComplianceCheckSetsController < BreadcrumbController
+class ComplianceCheckSetsController < InheritedResources::Base
   defaults resource_class: ComplianceCheckSet
   include RansackDateFilter
   before_action only: [:index] { set_date_time_params("created_at", DateTime) }
diff --git a/app/controllers/compliance_control_blocks_controller.rb b/app/controllers/compliance_control_blocks_controller.rb
index 2dd69a865..996f8a464 100644
--- a/app/controllers/compliance_control_blocks_controller.rb
+++ b/app/controllers/compliance_control_blocks_controller.rb
@@ -1,4 +1,4 @@
-class ComplianceControlBlocksController < BreadcrumbController
+class ComplianceControlBlocksController < InheritedResources::Base
   defaults resource_class: ComplianceControlBlock
   belongs_to :compliance_control_set
   actions :all, :except => [:show, :index]
@@ -9,4 +9,4 @@ class ComplianceControlBlocksController < BreadcrumbController
     params.require(:compliance_control_block).permit(:transport_mode, :transport_submode)
   end
 
-end
\ No newline at end of file
+end
diff --git a/app/controllers/compliance_control_sets_controller.rb b/app/controllers/compliance_control_sets_controller.rb
index 9de90c21c..a1c4f19f0 100644
--- a/app/controllers/compliance_control_sets_controller.rb
+++ b/app/controllers/compliance_control_sets_controller.rb
@@ -1,4 +1,4 @@
-class ComplianceControlSetsController < BreadcrumbController
+class ComplianceControlSetsController < InheritedResources::Base
   defaults resource_class: ComplianceControlSet
   include RansackDateFilter
   before_action only: [:index] { set_date_time_params("updated_at", DateTime) }
diff --git a/app/controllers/compliance_controls_controller.rb b/app/controllers/compliance_controls_controller.rb
index e51d1eb74..33eb9cc97 100644
--- a/app/controllers/compliance_controls_controller.rb
+++ b/app/controllers/compliance_controls_controller.rb
@@ -1,4 +1,4 @@
-class ComplianceControlsController < BreadcrumbController
+class ComplianceControlsController < InheritedResources::Base
   defaults resource_class: ComplianceControl
   belongs_to :compliance_control_set
 
diff --git a/app/controllers/concerns/policy_checker.rb b/app/controllers/concerns/policy_checker.rb
index 65a4428e2..d84263f2c 100644
--- a/app/controllers/concerns/policy_checker.rb
+++ b/app/controllers/concerns/policy_checker.rb
@@ -1,4 +1,5 @@
 module PolicyChecker
+  include Pundit
   extend ActiveSupport::Concern
 
   included do
diff --git a/app/controllers/dashboards_controller.rb b/app/controllers/dashboards_controller.rb
index 2585dafca..1c7876c58 100644
--- a/app/controllers/dashboards_controller.rb
+++ b/app/controllers/dashboards_controller.rb
@@ -3,7 +3,7 @@
 # this controller will use a custom partial like
 # custom/dashboards/_dashboard.html.slim for Custom::Dashboard
 #
-class DashboardsController < BreadcrumbController
+class DashboardsController < InheritedResources::Base
   respond_to :html, only: [:show]
 
   def show
diff --git a/app/controllers/group_of_lines_controller.rb b/app/controllers/group_of_lines_controller.rb
index 0553ba482..1a59d39f7 100644
--- a/app/controllers/group_of_lines_controller.rb
+++ b/app/controllers/group_of_lines_controller.rb
@@ -1,4 +1,4 @@
-class GroupOfLinesController < BreadcrumbController
+class GroupOfLinesController < InheritedResources::Base
   include ApplicationHelper
   include PolicyChecker
   defaults :resource_class => Chouette::GroupOfLine
diff --git a/app/controllers/import_messages_controller.rb b/app/controllers/import_messages_controller.rb
index 4ad398cbb..c3c6b46b5 100644
--- a/app/controllers/import_messages_controller.rb
+++ b/app/controllers/import_messages_controller.rb
@@ -1,4 +1,4 @@
-class ImportMessagesController < BreadcrumbController
+class ImportMessagesController < InheritedResources::Base
   defaults resource_class: ImportMessage, collection_name: 'import_messages', instance_name: 'import_message'
   respond_to :csv
   belongs_to :import, :parent_class => Import do
diff --git a/app/controllers/import_resources_controller.rb b/app/controllers/import_resources_controller.rb
index aee14d450..3e52233f2 100644
--- a/app/controllers/import_resources_controller.rb
+++ b/app/controllers/import_resources_controller.rb
@@ -1,4 +1,4 @@
-class ImportResourcesController < BreadcrumbController
+class ImportResourcesController < InheritedResources::Base
   defaults resource_class: ImportResource, collection_name: 'import_resources', instance_name: 'import_resource'
   respond_to :html
   belongs_to :import
diff --git a/app/controllers/imports_controller.rb b/app/controllers/imports_controller.rb
index 22fae24c2..6c9d81d82 100644
--- a/app/controllers/imports_controller.rb
+++ b/app/controllers/imports_controller.rb
@@ -1,4 +1,4 @@
-class ImportsController < BreadcrumbController
+class ImportsController < InheritedResources::Base
   include PolicyChecker
   include RansackDateFilter
   before_action only: [:index] { set_date_time_params("started_at", DateTime) }
diff --git a/app/controllers/line_referentials_controller.rb b/app/controllers/line_referentials_controller.rb
index fc4ab3cf5..f70ddef41 100644
--- a/app/controllers/line_referentials_controller.rb
+++ b/app/controllers/line_referentials_controller.rb
@@ -1,4 +1,4 @@
-class LineReferentialsController < BreadcrumbController
+class LineReferentialsController < InheritedResources::Base
 
   defaults :resource_class => LineReferential
 
diff --git a/app/controllers/lines_controller.rb b/app/controllers/lines_controller.rb
index 544d56e64..cf2908500 100644
--- a/app/controllers/lines_controller.rb
+++ b/app/controllers/lines_controller.rb
@@ -1,4 +1,4 @@
-class LinesController < BreadcrumbController
+class LinesController < InheritedResources::Base
   include ApplicationHelper
   include PolicyChecker
   defaults :resource_class => Chouette::Line
diff --git a/app/controllers/networks_controller.rb b/app/controllers/networks_controller.rb
index 363e56829..98c840777 100644
--- a/app/controllers/networks_controller.rb
+++ b/app/controllers/networks_controller.rb
@@ -1,4 +1,4 @@
-class NetworksController < BreadcrumbController
+class NetworksController < InheritedResources::Base
   include ApplicationHelper
   include PolicyChecker
   defaults :resource_class => Chouette::Network
diff --git a/app/controllers/organisations_controller.rb b/app/controllers/organisations_controller.rb
index 51a325586..d80541800 100644
--- a/app/controllers/organisations_controller.rb
+++ b/app/controllers/organisations_controller.rb
@@ -1,4 +1,4 @@
-class OrganisationsController < BreadcrumbController
+class OrganisationsController < InheritedResources::Base
 
   defaults :resource_class => Organisation
   respond_to :html, :only => [:edit, :show, :update]
@@ -18,6 +18,6 @@ class OrganisationsController < BreadcrumbController
   def organisation_params
     params.require(:organisation).permit(:name)
   end
-  
+
 end
 
diff --git a/app/controllers/referentials_controller.rb b/app/controllers/referentials_controller.rb
index e4357e878..6b479e938 100644
--- a/app/controllers/referentials_controller.rb
+++ b/app/controllers/referentials_controller.rb
@@ -1,4 +1,4 @@
-class ReferentialsController < BreadcrumbController
+class ReferentialsController < InheritedResources::Base
   defaults :resource_class => Referential
   include PolicyChecker
 
diff --git a/app/controllers/rule_parameter_sets_controller.rb b/app/controllers/rule_parameter_sets_controller.rb
index 7ab3cca23..de4863a08 100644
--- a/app/controllers/rule_parameter_sets_controller.rb
+++ b/app/controllers/rule_parameter_sets_controller.rb
@@ -1,4 +1,4 @@
-class RuleParameterSetsController < BreadcrumbController
+class RuleParameterSetsController < InheritedResources::Base
   defaults :resource_class => RuleParameterSet
   respond_to :html
   respond_to :js, :only => [ :mode ]
diff --git a/app/controllers/stop_area_referentials_controller.rb b/app/controllers/stop_area_referentials_controller.rb
index 5c87be43d..e2815e5fb 100644
--- a/app/controllers/stop_area_referentials_controller.rb
+++ b/app/controllers/stop_area_referentials_controller.rb
@@ -1,4 +1,4 @@
-class StopAreaReferentialsController < BreadcrumbController
+class StopAreaReferentialsController < InheritedResources::Base
 
   defaults :resource_class => StopAreaReferential
   def sync
diff --git a/app/controllers/stop_areas_controller.rb b/app/controllers/stop_areas_controller.rb
index 18ea33936..0c9f3067a 100644
--- a/app/controllers/stop_areas_controller.rb
+++ b/app/controllers/stop_areas_controller.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-class StopAreasController < BreadcrumbController
+class StopAreasController < InheritedResources::Base
   include ApplicationHelper
 
   defaults :resource_class => Chouette::StopArea
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 23ce3ef0a..2452a2796 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1,4 +1,4 @@
-class UsersController < BreadcrumbController
+class UsersController < InheritedResources::Base
 
   defaults :resource_class => User
 
diff --git a/app/controllers/workbenches_controller.rb b/app/controllers/workbenches_controller.rb
index fb3cce1ad..9b4f0d6c4 100644
--- a/app/controllers/workbenches_controller.rb
+++ b/app/controllers/workbenches_controller.rb
@@ -1,4 +1,4 @@
-class WorkbenchesController < BreadcrumbController
+class WorkbenchesController < InheritedResources::Base
   before_action :query_params, only: [:show]
   include RansackDateFilter
   before_action only: [:show] { set_date_time_params("validity_period", Date) }
-- 
cgit v1.2.3


From b0654a6e9242e19008540d1ac5fcba5c578227a7 Mon Sep 17 00:00:00 2001
From: Xinhui
Date: Thu, 26 Oct 2017 14:43:31 +0200
Subject: Remove BreadcrumbHelper from chouette_controller

---
 app/controllers/chouette_controller.rb | 1 -
 1 file changed, 1 deletion(-)

(limited to 'app/controllers')

diff --git a/app/controllers/chouette_controller.rb b/app/controllers/chouette_controller.rb
index cf7735624..1313aa7cc 100644
--- a/app/controllers/chouette_controller.rb
+++ b/app/controllers/chouette_controller.rb
@@ -1,6 +1,5 @@
 class ChouetteController < InheritedResources::Base
 
   include ApplicationHelper
-  include BreadcrumbHelper
   include ReferentialSupport
 end
-- 
cgit v1.2.3