aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers
diff options
context:
space:
mode:
authorXinhui2017-10-26 11:51:07 +0200
committerXinhui2017-10-26 11:51:07 +0200
commit68bc446c975ff07cf2b4eb9f695da2dce93ee63d (patch)
tree02249672f6d65a6167775702552a701756fa94e7 /app/controllers
parent0947fea02efce26c8c8d13bc99a5341ec7a20c66 (diff)
downloadchouette-core-68bc446c975ff07cf2b4eb9f695da2dce93ee63d.tar.bz2
Remove breadcrumb_controller
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/api_keys_controller.rb2
-rw-r--r--app/controllers/breadcrumb_controller.rb3
-rw-r--r--app/controllers/calendars_controller.rb2
-rw-r--r--app/controllers/chouette_controller.rb2
-rw-r--r--app/controllers/companies_controller.rb2
-rw-r--r--app/controllers/compliance_check_sets_controller.rb2
-rw-r--r--app/controllers/compliance_control_blocks_controller.rb4
-rw-r--r--app/controllers/compliance_control_sets_controller.rb2
-rw-r--r--app/controllers/compliance_controls_controller.rb2
-rw-r--r--app/controllers/concerns/policy_checker.rb1
-rw-r--r--app/controllers/dashboards_controller.rb2
-rw-r--r--app/controllers/group_of_lines_controller.rb2
-rw-r--r--app/controllers/import_messages_controller.rb2
-rw-r--r--app/controllers/import_resources_controller.rb2
-rw-r--r--app/controllers/imports_controller.rb2
-rw-r--r--app/controllers/line_referentials_controller.rb2
-rw-r--r--app/controllers/lines_controller.rb2
-rw-r--r--app/controllers/networks_controller.rb2
-rw-r--r--app/controllers/organisations_controller.rb4
-rw-r--r--app/controllers/referentials_controller.rb2
-rw-r--r--app/controllers/rule_parameter_sets_controller.rb2
-rw-r--r--app/controllers/stop_area_referentials_controller.rb2
-rw-r--r--app/controllers/stop_areas_controller.rb2
-rw-r--r--app/controllers/users_controller.rb2
-rw-r--r--app/controllers/workbenches_controller.rb2
25 files changed, 26 insertions, 28 deletions
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) }