Download as
Browse Code »

Commit 1b6912439fea3e9d3e8cae45bbe8e4ba22fcb175

Authored by Leonardo Merlin
2 parents 0b0d081e d22d51d2
Exists in master and in 6 other branches feature-captcha, feature-respostas, production, rafael, staging, the_glorious_return_of_piwik

Merge branch 'fix-vote-proposal-logged-in'

Showing 2 changed files with 10 additions and 2 deletions   Show diff stats
src/app/components/article-service/article.service.js
  Diff comments   View file @1b69124
... ... @@ -166,8 +166,16 @@
166 166  
167 167 function voteProposal (proposal_id, params){
168 168 var url = service.apiArticles + proposal_id + '/vote';
  169 +
  170 + var private_token = null;
  171 + if($rootScope.currentUser && $rootScope.currentUser.private_token){
  172 + private_token = $rootScope.currentUser.private_token;
  173 + }else{
  174 + private_token = $rootScope.temporaryToken;
  175 + }
  176 +
169 177 var paramsExtended = angular.extend({
170   - private_token: $rootScope.temporaryToken
  178 + private_token: private_token
171 179 }, params);
172 180  
173 181 var encodedParams = angular.element.param(paramsExtended);
... ...
src/app/components/proposal-box/proposal-box.directive.js
  Diff comments   View file @1b69124
... ... @@ -103,7 +103,7 @@
103 103 ProposalBoxController.prototype.canVote = function() {
104 104 var vm = this;
105 105  
106   - return !!vm.$rootScope.temporaryToken;
  106 + return !!vm.$rootScope.temporaryToken || (vm.$rootScope.currentUser && !!vm.$rootScope.currentUser.private_token);
107 107 };
108 108  
109 109 ProposalBoxController.prototype.submitCaptcha = function($event, captchaForm) {
... ...