Download as
Browse Code »

Commit e76cbb4ca61ca4b8385311dcaa95e223b3ca3ae3

Authored by Leonardo Merlin
1 parent 8f367e39
Exists in master and in 8 other branches css-list, feature-captcha, feature-proposal-vote, feature-respostas, production, rafael, staging, the_glorious_return_of_piwik

Fix redirectURI

Showing 2 changed files with 4 additions and 9 deletions   Show diff stats
src/app/components/proposal-box/proposal-box.directive.js
  Diff comments   View file @e76cbb4
@@ -34,6 +34,10 @@ @@ -34,6 +34,10 @@
34 vm.errorOnSkip = false; 34 vm.errorOnSkip = false;
35 vm.showAuthMessage = null; 35 vm.showAuthMessage = null;
36 vm.voteProposalRedirectURI = null; 36 vm.voteProposalRedirectURI = null;
  37 +
  38 + var slug = vm.topic.slug;
  39 + var proposal_id = vm.proposal.id;
  40 + vm.voteProposalRedirectURI = 'state=programa&task=vote-proposal&slug=' + slug + '&proposal_id=' + proposal_id;
37 }; 41 };
38 42
39 ProposalBoxController.prototype.addListeners = function () { 43 ProposalBoxController.prototype.addListeners = function () {
@@ -64,14 +68,6 @@ @@ -64,14 +68,6 @@
64 68
65 vm.message = data.message; 69 vm.message = data.message;
66 }); 70 });
67 -  
68 - vm.$scope.$watch('vm.voteProposalRedirectURI', function(newValue, oldValue){  
69 - if(newValue && newValue !== oldValue){  
70 - var slug = vm.topic.slug;  
71 - var proposal_id = vm.proposal.id;  
72 - vm.voteProposalRedirectURI = 'state=programa&task=vote-proposal&slug=' + slug + '&proposal_id=' + proposal_id;  
73 - }  
74 - });  
75 }; 71 };
76 72
77 ProposalBoxController.prototype.showContent = function (slug) { 73 ProposalBoxController.prototype.showContent = function (slug) {
src/app/components/proposal-box/proposal-box.html
  Diff comments   View file @e76cbb4
@@ -75,7 +75,6 @@ @@ -75,7 +75,6 @@
75 <p>Você precisa estar logado para votar na proposta</p> 75 <p>Você precisa estar logado para votar na proposta</p>
76 <br> 76 <br>
77 <p> 77 <p>
78 - <!-- <a ui-sref="entrar({redirect_uri: vm.voteProposalRedirectURI})">Clique aqui</a> para ir para a página de login. -->  
79 <a ui-sref="entrar({redirect_uri: vm.voteProposalRedirectURI})">Clique aqui para ir para a página de login</a> 78 <a ui-sref="entrar({redirect_uri: vm.voteProposalRedirectURI})">Clique aqui para ir para a página de login</a>
80 </p> 79 </p>
81 </div> 80 </div>