diff --git a/app/controllers/admin/poll/base_controller.rb b/app/controllers/admin/poll/base_controller.rb new file mode 100644 index 000000000..c58e4f23c --- /dev/null +++ b/app/controllers/admin/poll/base_controller.rb @@ -0,0 +1,10 @@ +class Admin::Poll::BaseController < Admin::BaseController + helper_method :namespace + + private + + def namespace + "admin" + end + +end diff --git a/app/controllers/admin/poll/booth_assignments_controller.rb b/app/controllers/admin/poll/booth_assignments_controller.rb index 358f26a65..72b8347cc 100644 --- a/app/controllers/admin/poll/booth_assignments_controller.rb +++ b/app/controllers/admin/poll/booth_assignments_controller.rb @@ -1,4 +1,4 @@ -class Admin::Poll::BoothAssignmentsController < Admin::BaseController +class Admin::Poll::BoothAssignmentsController < Admin::Poll::BaseController before_action :load_poll, except: [:create, :destroy] diff --git a/app/controllers/admin/poll/booths_controller.rb b/app/controllers/admin/poll/booths_controller.rb index 4b322f0b2..7a3a1370d 100644 --- a/app/controllers/admin/poll/booths_controller.rb +++ b/app/controllers/admin/poll/booths_controller.rb @@ -1,4 +1,4 @@ -class Admin::Poll::BoothsController < Admin::BaseController +class Admin::Poll::BoothsController < Admin::Poll::BaseController load_and_authorize_resource class: 'Poll::Booth' def index @@ -41,4 +41,4 @@ class Admin::Poll::BoothsController < Admin::BaseController params.require(:poll_booth).permit(:name, :location) end -end \ No newline at end of file +end diff --git a/app/controllers/admin/poll/officer_assignments_controller.rb b/app/controllers/admin/poll/officer_assignments_controller.rb index 45c9a225a..5039df701 100644 --- a/app/controllers/admin/poll/officer_assignments_controller.rb +++ b/app/controllers/admin/poll/officer_assignments_controller.rb @@ -1,4 +1,4 @@ -class Admin::Poll::OfficerAssignmentsController < Admin::BaseController +class Admin::Poll::OfficerAssignmentsController < Admin::Poll::BaseController before_action :load_poll before_action :redirect_if_blank_required_params, only: [:by_officer] diff --git a/app/controllers/admin/poll/officers_controller.rb b/app/controllers/admin/poll/officers_controller.rb index 2641a12b5..1d5c19634 100644 --- a/app/controllers/admin/poll/officers_controller.rb +++ b/app/controllers/admin/poll/officers_controller.rb @@ -1,4 +1,4 @@ -class Admin::Poll::OfficersController < Admin::BaseController +class Admin::Poll::OfficersController < Admin::Poll::BaseController load_and_authorize_resource :officer, class: "Poll::Officer", except: [:edit, :show] def index @@ -36,4 +36,4 @@ class Admin::Poll::OfficersController < Admin::BaseController def edit end -end \ No newline at end of file +end diff --git a/app/controllers/admin/poll/polls_controller.rb b/app/controllers/admin/poll/polls_controller.rb index cad91f218..c95c8ed1f 100644 --- a/app/controllers/admin/poll/polls_controller.rb +++ b/app/controllers/admin/poll/polls_controller.rb @@ -1,4 +1,4 @@ -class Admin::Poll::PollsController < Admin::BaseController +class Admin::Poll::PollsController < Admin::Poll::BaseController load_and_authorize_resource before_action :load_search, only: [:search_booths, :search_questions, :search_officers] diff --git a/app/controllers/admin/poll/questions_controller.rb b/app/controllers/admin/poll/questions_controller.rb index 3bbe1c395..8f6c18841 100644 --- a/app/controllers/admin/poll/questions_controller.rb +++ b/app/controllers/admin/poll/questions_controller.rb @@ -1,4 +1,4 @@ -class Admin::Poll::QuestionsController < Admin::BaseController +class Admin::Poll::QuestionsController < Admin::Poll::BaseController include CommentableActions load_and_authorize_resource :poll diff --git a/app/controllers/admin/poll/recounts_controller.rb b/app/controllers/admin/poll/recounts_controller.rb index 57289a207..6453b5fa3 100644 --- a/app/controllers/admin/poll/recounts_controller.rb +++ b/app/controllers/admin/poll/recounts_controller.rb @@ -1,4 +1,4 @@ -class Admin::Poll::RecountsController < Admin::BaseController +class Admin::Poll::RecountsController < Admin::Poll::BaseController before_action :load_poll def index diff --git a/app/controllers/admin/poll/results_controller.rb b/app/controllers/admin/poll/results_controller.rb index 2c5bbba27..8d1d22d91 100644 --- a/app/controllers/admin/poll/results_controller.rb +++ b/app/controllers/admin/poll/results_controller.rb @@ -1,4 +1,4 @@ -class Admin::Poll::ResultsController < Admin::BaseController +class Admin::Poll::ResultsController < Admin::Poll::BaseController before_action :load_poll def index @@ -10,4 +10,4 @@ class Admin::Poll::ResultsController < Admin::BaseController def load_poll @poll = ::Poll.includes(:questions).find(params[:poll_id]) end -end \ No newline at end of file +end diff --git a/app/controllers/admin/poll/shifts_controller.rb b/app/controllers/admin/poll/shifts_controller.rb index 168284474..48f540c07 100644 --- a/app/controllers/admin/poll/shifts_controller.rb +++ b/app/controllers/admin/poll/shifts_controller.rb @@ -1,5 +1,5 @@ -class Admin::Poll::ShiftsController < Admin::BaseController - +class Admin::Poll::ShiftsController < Admin::Poll::BaseController + before_action :load_booth before_action :load_polls before_action :load_officer @@ -57,4 +57,4 @@ class Admin::Poll::ShiftsController < Admin::BaseController params.require(:shift).permit(:booth_id, :officer_id, :date) end -end \ No newline at end of file +end