zecfoundation
/
zcash-grant-system
mirror of https://github.com/ZcashFoundation/zcash-grant-system.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into finalize-categories

This commit is contained in:
Daniel Ternyak 2019-02-11 16:47:07 -06:00 committed by GitHub
parent 7d6d38552c 589702c394
commit f2e685b1d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
backend/grant/admin/views.py
View File

@ -62,6 +62,7 @@ def stats():
.filter(Proposal.status == ProposalStatus.PENDING) \ .filter(Proposal.status == ProposalStatus.PENDING) \
.scalar() .scalar()
proposal_no_arbiter_count = db.session.query(func.count(Proposal.id)) \ proposal_no_arbiter_count = db.session.query(func.count(Proposal.id)) \
.join(Proposal.arbiter) \
.filter(Proposal.status == ProposalStatus.LIVE) \ .filter(Proposal.status == ProposalStatus.LIVE) \
.filter(ProposalArbiter.status == ProposalArbiterStatus.MISSING) \ .filter(ProposalArbiter.status == ProposalArbiterStatus.MISSING) \
.scalar() .scalar()

2
backend/grant/proposal/models.py
View File

@ -277,7 +277,7 @@ class Proposal(db.Model):
# arbiter needs proposal.id # arbiter needs proposal.id
db.session.add(proposal) db.session.add(proposal)
db.session.commit() db.session.flush()
arbiter = ProposalArbiter(proposal_id=proposal.id) arbiter = ProposalArbiter(proposal_id=proposal.id)
db.session.add(arbiter) db.session.add(arbiter)

3
backend/grant/utils/pagination.py
View File

@ -87,7 +87,8 @@ class ProposalPagination(Pagination):
if cat_filters: if cat_filters:
query = query.filter(Proposal.category.in_(cat_filters)) query = query.filter(Proposal.category.in_(cat_filters))
if arbiter_filters: if arbiter_filters:
query = query.filter(ProposalArbiter.status.in_(arbiter_filters)) query = query.join(Proposal.arbiter) \
.filter(ProposalArbiter.status.in_(arbiter_filters))
# SORT (see self.SORT_MAP) # SORT (see self.SORT_MAP)
if sort: if sort: