From 3d5a9f63e95801d1c89d5dde2b33557d263ef44f Mon Sep 17 00:00:00 2001 From: ailobe Date: Wed, 3 Apr 2019 14:55:28 +0200 Subject: [PATCH 1/2] Fix participants metrics --- .../metrics/proposal_participants_metric_measure.rb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/decidim-proposals/app/queries/decidim/proposals/metrics/proposal_participants_metric_measure.rb b/decidim-proposals/app/queries/decidim/proposals/metrics/proposal_participants_metric_measure.rb index 0fc05ee49aad..2c5078f17b45 100644 --- a/decidim-proposals/app/queries/decidim/proposals/metrics/proposal_participants_metric_measure.rb +++ b/decidim-proposals/app/queries/decidim/proposals/metrics/proposal_participants_metric_measure.rb @@ -34,7 +34,13 @@ def calculate def retrieve_proposals(from_start = false) @proposals ||= Decidim::Proposals::Proposal.where(component: @resource).joins(:coauthorships) .includes(:votes, :endorsements) - .where(decidim_coauthorships: { decidim_author_type: "Decidim::UserBaseEntity" }) + .where(decidim_coauthorships: { + decidim_author_type: [ + "Decidim::UserBaseEntity", + "Decidim::Organization", + "Decidim::Meetings::Meeting" + ] + }) .where("decidim_proposals_proposals.published_at <= ?", end_time) .except_withdrawn From 5c453c0f0e464cd27af9f81c665f696cbfd027b0 Mon Sep 17 00:00:00 2001 From: ailobe Date: Wed, 3 Apr 2019 15:11:00 +0200 Subject: [PATCH 2/2] Add CHANGELOG entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 32cec694abe6..9df95394b92f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ **Fixed**: +- **decidim-proposals**: Fix proposal participants metrics. [#5048](https://github.com/decidim/decidim/pull/5048) - **decidim-core**: Fix amendments forms: show error messages and render hashtags. [#4951](https://github.com/decidim/decidim/pull/4951) - **decidim-comments**: Fixes that as a normal user (no private user) I can comment on a private assembly where is available. [#4924](https://github.com/decidim/decidim/pull/4924) - **decidim-accountability**: Handle special case when all children weight are nil on accountability. [#5026](https://github.com/decidim/decidim/pull/5026)