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

Dont show unconfirmed txs unless its you

This commit is contained in:
Will O'Beirne 2019-01-09 17:54:41 -05:00
parent 6c8ce3f87d
commit 311fdb298d
No known key found for this signature in database
GPG Key ID: 44C190DB5DEAF9F6
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,6 +25,7 @@ from .models import (
proposal_team, proposal_team,
ProposalTeamInvite, ProposalTeamInvite,
proposal_team_invite_schema, proposal_team_invite_schema,
proposal_proposal_contributions_schema,
db, db,
DRAFT, DRAFT,
PENDING, PENDING,

7
backend/grant/user/views.py
View File

@ -13,7 +13,8 @@ from grant.proposal.models import (
user_proposals_schema, user_proposals_schema,
PENDING, PENDING,
APPROVED, APPROVED,
REJECTED REJECTED,
CONFIRMED
) )
from grant.utils.auth import requires_auth, requires_same_user_auth, get_authed_user from grant.utils.auth import requires_auth, requires_same_user_auth, get_authed_user
from grant.utils.upload import remove_avatar, sign_avatar_upload, AvatarException from grant.utils.upload import remove_avatar, sign_avatar_upload, AvatarException
@ -64,19 +65,21 @@ def get_user(user_id, with_proposals, with_comments, with_funded, with_pending):
user = User.get_by_id(user_id) user = User.get_by_id(user_id)
if user: if user:
result = user_schema.dump(user) result = user_schema.dump(user)
authed_user = get_authed_user()
if with_proposals: if with_proposals:
proposals = Proposal.get_by_user(user) proposals = Proposal.get_by_user(user)
proposals_dump = user_proposals_schema.dump(proposals) proposals_dump = user_proposals_schema.dump(proposals)
result["proposals"] = proposals_dump result["proposals"] = proposals_dump
if with_funded: if with_funded:
contributions = ProposalContribution.get_by_userid(user_id) contributions = ProposalContribution.get_by_userid(user_id)
if not authed_user or user.id != authed_user.id:
contributions = [c for c in contributions if c.status == CONFIRMED]
contributions_dump = user_proposal_contributions_schema.dump(contributions) contributions_dump = user_proposal_contributions_schema.dump(contributions)
result["contributions"] = contributions_dump result["contributions"] = contributions_dump
if with_comments: if with_comments:
comments = Comment.get_by_user(user) comments = Comment.get_by_user(user)
comments_dump = user_comments_schema.dump(comments) comments_dump = user_comments_schema.dump(comments)
result["comments"] = comments_dump result["comments"] = comments_dump
authed_user = get_authed_user()
if with_pending and authed_user and authed_user.id == user.id: if with_pending and authed_user and authed_user.id == user.id:
pending = Proposal.get_by_user(user, [PENDING, APPROVED, REJECTED]) pending = Proposal.get_by_user(user, [PENDING, APPROVED, REJECTED])
pending_dump = user_proposals_schema.dump(pending) pending_dump = user_proposals_schema.dump(pending)