Download as
Browse Code »

Commit da015b9fb0ca12a2c5bc914d156bf71ec6640992

Authored by Leonardo Merlin
2 parents ae8e4e89 c162e5b0
Exists in master and in 5 other branches build, build2, contigency_plan_recaptcha, production, staging

Merge branch 'master' of gitlab.com:participa/proposal-app

Showing 1 changed file with 7 additions and 3 deletions   Show diff stats
@@ -110,7 +110,7 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F @@ -110,7 +110,7 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F
110 110
111 if(ProposalApp.hasProposalbeenVoted(article.id)){ 111 if(ProposalApp.hasProposalbeenVoted(article.id)){
112 console.log("Proposta " + article.id + " já havia sido votada"); 112 console.log("Proposta " + article.id + " já havia sido votada");
113 - Main.displaySuccess(button.closest('.support-proposal .section-content'), 'Voto realizado com sucesso', 800); 113 + Main.displaySuccess(button.closest('.support-proposal .section-content'), 'Seu voto já foi computado nesta proposta', 800);
114 contextMain.loadRandomProposal(topic_id); 114 contextMain.loadRandomProposal(topic_id);
115 e.preventDefault(); 115 e.preventDefault();
116 return; 116 return;
@@ -123,8 +123,12 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F @@ -123,8 +123,12 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F
123 value: $(this).data('vote-value'), 123 value: $(this).data('vote-value'),
124 private_token: Main.private_token 124 private_token: Main.private_token
125 } 125 }
126 - }).done(function( /*data*/ ) {  
127 - Main.displaySuccess(button.closest('.support-proposal .section-content'), 'Voto realizado com sucesso', 800); 126 + }).done(function(data) {
  127 + if(data.vote) {
  128 + Main.displaySuccess(button.closest('.support-proposal .section-content'), 'Voto realizado com sucesso', 800);
  129 + } else {
  130 + Main.displaySuccess(button.closest('.support-proposal .section-content'), 'Seu voto já foi computado nesta proposta', 800);
  131 + }
128 ProposalApp.addVotedProposal(article.id); 132 ProposalApp.addVotedProposal(article.id);
129 contextMain.loadRandomProposal(topic_id); 133 contextMain.loadRandomProposal(topic_id);
130 }); 134 });