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.

Sign up for GitHub

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

Jump to bottom

Fix proposal participants metrics #5048

Merged
merged 3 commits into from Apr 15, 2019
Merged

Fix proposal participants metrics #5048

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3d5a9f6
Fix participants metrics
aitorlb Apr 3, 2019
5c453c0
Add CHANGELOG entry
aitorlb Apr 3, 2019
9df64ed
Merge branch 'master' into fix/participants_metrics
oriolgual Apr 15, 2019
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
View file
Open in desktop
Expand Up @@ -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)
Expand Down
8 changes: 7 additions & 1 deletion ...m-proposals/app/queries/decidim/proposals/metrics/proposal_participants_metric_measure.rb
View file
Open in desktop
Expand Up @@ -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

Expand Down