Merge branch 'develop' into finalize-categories

backend/grant/admin/views.py

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

backend/grant/proposal/models.py

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

backend/grant/utils/pagination.py

@@ -87,7 +87,8 @@ class ProposalPagination(Pagination):
             if cat_filters:
                 query = query.filter(Proposal.category.in_(cat_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)
         if sort: