Merge branch 'master' into feature/111-unconfirmed_balances

This commit is contained in:
2019-05-01 19:56:43 +01:00
committed by GitHub
18 changed files with 213 additions and 96 deletions
+6 -6
View File
@@ -27,21 +27,21 @@ export default Controller.extend({
actions: {
vetoContribution (/* contributionId */) {
// this.kredits.vote(proposalId).then(transaction => {
// window.confirm('Vote submitted to Ethereum blockhain: '+transaction.hash);
// });
vetoContribution (contributionId) {
this.kredits.veto(contributionId).then(transaction => {
console.debug('[controllers:index] Veto submitted to Ethereum blockhain: '+transaction.hash);
});
},
confirmProposal (proposalId) {
this.kredits.vote(proposalId).then(transaction => {
window.confirm('Vote submitted to Ethereum blockhain: '+transaction.hash);
console.debug('[controllers:index] Vote submitted to Ethereum blockhain: '+transaction.hash);
});
},
save (contributor) {
return this.kredits.addContributor(contributor)
.then((contributor) => {
.then(contributor => {
this.contributors.pushObject(contributor);
return contributor;
});