Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add base controller for Admin:Poll controller #1863

Merged
merged 2 commits into from
Sep 19, 2017

Conversation

aitbw
Copy link
Collaborator

@aitbw aitbw commented Sep 13, 2017

Where

Fixes #1848

What

Solves #1848, which caused a RoutingError exception as well as a missing I18n key.

How

Created a base_controller.rb file under app/admin/poll, with a namespace helper method, similar to the base_controller.rb file under app/admin/site_customization. Then, the parent class Admin::BaseController was replaced with Admin::Poll::BaseController where necessary.

Screenshots

screenshot-2017-9-13 admin
Here's how the header looks when visiting /admin/polls/.

aitbw and others added 2 commits September 13, 2017 12:22
Fixes consuldemocracy#1848

On branch aperez-fix-for-issue-1848
  Changes to be committed:
    new file:   app/controllers/admin/poll/base_controller.rb
    modified:   app/controllers/admin/poll/booth_assignments_controller.rb
    modified:   app/controllers/admin/poll/booths_controller.rb
    modified:   app/controllers/admin/poll/officer_assignments_controller.rb
    modified:   app/controllers/admin/poll/officers_controller.rb
    modified:   app/controllers/admin/poll/polls_controller.rb
    modified:   app/controllers/admin/poll/questions_controller.rb
    modified:   app/controllers/admin/poll/recounts_controller.rb
    modified:   app/controllers/admin/poll/results_controller.rb
    modified:   app/controllers/admin/poll/shifts_controller.rb
@bertocq bertocq merged commit 9b0732b into consuldemocracy:master Sep 19, 2017
@aitbw aitbw deleted the aperez-fix-for-issue-1848 branch January 15, 2018 18:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants