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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix present in results admin controller #4272

Merged
merged 7 commits into from Oct 15, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Expand Up @@ -55,6 +55,7 @@ Decidim::User.where(**search for old subscribed users**).update(newsletter_notif

**Fixed**:

- **decidim-accountability**: Fix inclusion of ApplicationHelper in results controller. [\#4272](https://github.com/decidim/decidim/pull/4272)
- **decidim-admin**: Add email validation to ManagedUserPromotionForm. [\#4225](https://github.com/decidim/decidim/pull/4225)
- **decidim-surveys**: Fix issue when copying. [\#4274](https://github.com/decidim/decidim/pull/4274)
- **decidim-proposals**: Fix uncatched exception when trying to retrieve a Proposal from an invalid url match. [\4157](https://github.com/decidim/decidim/pull/4157)
Expand Down
Expand Up @@ -6,7 +6,7 @@ module Admin
# This controller allows an admin to manage results from a Participatory Process
class ResultsController < Admin::ApplicationController
include Decidim::ApplicationHelper
helper_method :results, :parent_result, :parent_results, :statuses
helper_method :results, :parent_result, :parent_results, :statuses, :present

def new
enforce_permission_to :create, :result
Expand Down
Expand Up @@ -6,6 +6,7 @@ module Decidim
module Accountability
module Admin
describe ResultsController, type: :controller do
include Decidim::ApplicationHelper
routes { Decidim::Accountability::AdminEngine.routes }

let(:organization) { create(:organization) }
Expand Down