Merge branch 'develop' into better-validation

This commit is contained in:
Daniel Ternyak 2019-03-18 16:00:06 -05:00 committed by GitHub
commit a4a80bfe4c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 28 additions and 0 deletions

View File

@ -378,6 +378,10 @@ def post_proposal_update(proposal_id, title, content):
"address": fields.Str(required=True, validate=validate.Length(max=255)),
})
def post_proposal_team_invite(proposal_id, address):
for u in g.current_proposal.team:
if address == u.email_address:
return {"message": f"Cannot invite members already on the team"}, 400
existing_invite = ProposalTeamInvite.query.filter_by(
proposal_id=proposal_id,
address=address

View File

@ -7,6 +7,9 @@
margin-bottom: 1rem;
&-info {
min-width: 0;
padding-right: 2rem;
&-title {
font-size: 1.2rem;
font-weight: 600;

View File

@ -16,3 +16,20 @@
div.antd-pro-ellipsis-ellipsis {
word-break: break-word;
}
// List items with long content can push the actions aside
.ant-list-item {
overflow: hidden;
.ant-list-item-content,
.ant-list-item-meta,
.ant-list-item-meta-content {
min-width: 0;
}
.ant-list-item-meta-title,
.ant-list-item-meta-description {
overflow: hidden;
text-overflow: ellipsis;
}
}

View File

@ -149,6 +149,10 @@ export function massageSerializedState(state: AppState) {
);
state.proposal.detail.contributionBounty = new BN((state.proposal.detail
.contributionBounty as any) as string);
state.proposal.detail.milestones = state.proposal.detail.milestones.map(m => ({
...m,
amount: new BN((m.amount as any) as string, 16),
}));
if (state.proposal.detail.rfp && state.proposal.detail.rfp.bounty) {
state.proposal.detail.rfp.bounty = new BN(
(state.proposal.detail.rfp.bounty as any) as string,