consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1863 from wairbut-m2c/aperez-fix-for-issue-1848

Browse Source 
Add base controller for Admin:Poll controller
This commit is contained in:
BertoCQ
2017-09-19 22:54:14 +02:00
committed by GitHub
parent 033df1192f d0528acb85
commit 9b0732b8d9
10 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/controllers/admin/poll/base_controller.rb Normal file
View File

@@ -0,0 +1,10 @@
class Admin::Poll::BaseController < Admin::BaseController
helper_method :namespace
private
def namespace
"admin"
end
end

2
app/controllers/admin/poll/booth_assignments_controller.rb
View File

@@ -1,4 +1,4 @@
class Admin::Poll::BoothAssignmentsController < Admin::BaseController
class Admin::Poll::BoothAssignmentsController < Admin::Poll::BaseController
before_action :load_poll, except: [:create, :destroy]

4
app/controllers/admin/poll/booths_controller.rb
View File

@@ -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
end

2
app/controllers/admin/poll/officer_assignments_controller.rb
View File

@@ -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]

4
app/controllers/admin/poll/officers_controller.rb
View File

@@ -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
end

2
app/controllers/admin/poll/polls_controller.rb
View File

@@ -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]

2
app/controllers/admin/poll/questions_controller.rb
View File

@@ -1,4 +1,4 @@
class Admin::Poll::QuestionsController < Admin::BaseController
class Admin::Poll::QuestionsController < Admin::Poll::BaseController
include CommentableActions
load_and_authorize_resource :poll

2
app/controllers/admin/poll/recounts_controller.rb
View File

@@ -1,4 +1,4 @@
class Admin::Poll::RecountsController < Admin::BaseController
class Admin::Poll::RecountsController < Admin::Poll::BaseController
before_action :load_poll
def index

4
app/controllers/admin/poll/results_controller.rb
View File

@@ -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
end

4
app/controllers/admin/poll/shifts_controller.rb
View File

@@ -1,4 +1,4 @@
class Admin::Poll::ShiftsController < Admin::BaseController
class Admin::Poll::ShiftsController < Admin::Poll::BaseController
before_action :load_booth
before_action :load_polls
@@ -57,4 +57,4 @@ class Admin::Poll::ShiftsController < Admin::BaseController
params.require(:shift).permit(:booth_id, :officer_id, :date)
end
end
end