PR feedback fixes.
This commit is contained in:
parent
58c0f8cfdc
commit
05372e572b
|
@ -86,6 +86,7 @@ def stats():
|
||||||
.scalar()
|
.scalar()
|
||||||
# Count contributions on proposals that didn't get funded for users who have specified a refund address
|
# Count contributions on proposals that didn't get funded for users who have specified a refund address
|
||||||
contribution_refundable_count = db.session.query(func.count(ProposalContribution.id)) \
|
contribution_refundable_count = db.session.query(func.count(ProposalContribution.id)) \
|
||||||
|
.filter(ProposalContribution.refund_tx_id == None) \
|
||||||
.join(Proposal) \
|
.join(Proposal) \
|
||||||
.filter(Proposal.stage == ProposalStage.REFUNDING) \
|
.filter(Proposal.stage == ProposalStage.REFUNDING) \
|
||||||
.join(ProposalContribution.user) \
|
.join(ProposalContribution.user) \
|
||||||
|
|
|
@ -3,6 +3,7 @@ from datetime import datetime, timedelta
|
||||||
from grant.extensions import db
|
from grant.extensions import db
|
||||||
from grant.email.send import send_email
|
from grant.email.send import send_email
|
||||||
from grant.utils.enums import ProposalStage
|
from grant.utils.enums import ProposalStage
|
||||||
|
from grant.utils.misc import make_url
|
||||||
|
|
||||||
|
|
||||||
class ProposalReminder:
|
class ProposalReminder:
|
||||||
|
@ -81,6 +82,7 @@ class ProposalDeadline:
|
||||||
'contribution': c,
|
'contribution': c,
|
||||||
'proposal': proposal,
|
'proposal': proposal,
|
||||||
'refund_address': c.user.settings.refund_address,
|
'refund_address': c.user.settings.refund_address,
|
||||||
|
'account_settings_url': make_url('/profile/settings?tab=account')
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -149,14 +149,16 @@ class ContributionPagination(Pagination):
|
||||||
|
|
||||||
if status_filters:
|
if status_filters:
|
||||||
query = query.filter(ProposalContribution.status.in_(status_filters))
|
query = query.filter(ProposalContribution.status.in_(status_filters))
|
||||||
|
|
||||||
if 'REFUNDABLE' in filters:
|
if 'REFUNDABLE' in filters:
|
||||||
query = query.join(Proposal) \
|
query = query.filter(ProposalContribution.refund_tx_id == None) \
|
||||||
|
.join(Proposal) \
|
||||||
.filter(Proposal.stage == ProposalStage.REFUNDING) \
|
.filter(Proposal.stage == ProposalStage.REFUNDING) \
|
||||||
.join(ProposalContribution.user) \
|
.join(ProposalContribution.user) \
|
||||||
.join(UserSettings) \
|
.join(UserSettings) \
|
||||||
.filter(UserSettings.refund_address != None) \
|
.filter(UserSettings.refund_address != None) \
|
||||||
|
|
||||||
|
|
||||||
# SORT (see self.SORT_MAP)
|
# SORT (see self.SORT_MAP)
|
||||||
if sort:
|
if sort:
|
||||||
self.validate_sort(sort)
|
self.validate_sort(sort)
|
||||||
|
|
Loading…
Reference in New Issue