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

Several bugs (#378) 

* #375 admin long lines in proposal Detail card

* #371 comment_reply & proposal_comment email url typo

* #367 fix link to RFP from Proposal create, just use id

* #368 profile avatar removal, allow_none on /user PUT
This commit is contained in:
AMStrix 2019-03-14 20:55:13 -05:00 committed by Daniel Ternyak
parent d2e8acd704
commit ad844263dd
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/src/components/ProposalDetail/index.less
View File

@ -18,7 +18,7 @@
font-size: 0.7rem;
position: absolute;
opacity: 0.8;
top: 1rem;
bottom: -0.7rem;
}
}

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

@ -142,7 +142,7 @@ def post_proposal_comments(proposal_id, comment, parent_comment_id):
send_email(member.email_address, 'proposal_comment', {
'author': g.current_user,
'proposal': proposal,
'comment_url': make_url(f'/proposal/{proposal.id}?tab=discussions&comment={comment.id}'),
'comment_url': make_url(f'/proposals/{proposal.id}?tab=discussions&comment={comment.id}'),
'author_url': make_url(f'/profile/{comment.author.id}'),
})
# Email parent comment creator, if it's not themselves
@ -150,7 +150,7 @@ def post_proposal_comments(proposal_id, comment, parent_comment_id):
send_email(parent.author.email_address, 'comment_reply', {
'author': g.current_user,
'proposal': proposal,
'comment_url': make_url(f'/proposal/{proposal.id}?tab=discussions&comment={comment.id}'),
'comment_url': make_url(f'/proposals/{proposal.id}?tab=discussions&comment={comment.id}'),
'author_url': make_url(f'/profile/{comment.author.id}'),
})

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

@ -273,7 +273,7 @@ def delete_avatar(url):
"displayName": fields.Str(required=True, validate=lambda d: 2 <= len(d) <= 60),
"title": fields.Str(required=True, validate=lambda t: 2 <= len(t) <= 60),
"socialMedias": fields.List(fields.Dict(), required=True),
"avatar": fields.Str(required=True, validate=lambda d: validators.url(d))
"avatar": fields.Str(required=True, allow_none=True, validate=lambda d: validators.url(d))
})
def update_user(user_id, display_name, title, social_medias, avatar):
user = g.current_user

2
frontend/client/components/CreateFlow/Basics.tsx
View File

@ -81,7 +81,7 @@ class CreateFlowBasics extends React.Component<Props, State> {
description={
<>
This proposal is for the open request{' '}
<Link to={`/requests/${rfp.urlId}`} target="_blank">
<Link to={`/requests/${rfp.id}`} target="_blank">
{rfp.title}
</Link>
. If you didn’t mean to do this, or want to unlink it,{' '}