Download as
Browse Code »

Commit 106db731acaf4c12031ffda5c4c93fdd35ba42de

Authored by Caio Almeida
2 parents 02939d91 2b812502
Exists in master and in 11 other branches build, build2, capa, captcha, contigency_plan_recaptcha, jasmine-testing, make_harder_to_vote_twice, production, refactory-sass, session_cookie, staging

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

Showing 1 changed file with 7 additions and 5 deletions   Show diff stats
@@ -24,9 +24,9 @@ if(participa){ @@ -24,9 +24,9 @@ if(participa){
24 //var proposal_discussion = '401'; //casa 24 //var proposal_discussion = '401'; //casa
25 } 25 }
26 26
27 -var noosferoAPI = host + '/api/v1/articles/' + proposal_discussion + '?private_token=' + private_token; 27 +var noosferoAPI = host + '/api/v1/articles/' + proposal_discussion;
28 28
29 -$.getJSON(noosferoAPI) 29 +$.ajax({url: noosferoAPI, dataType: 'json', headers: {"Private-Token": private_token} })
30 .done(function( data ) { 30 .done(function( data ) {
31 data['host'] = host; 31 data['host'] = host;
32 data['private_token'] = private_token; 32 data['private_token'] = private_token;
@@ -77,7 +77,8 @@ $.getJSON(noosferoAPI) @@ -77,7 +77,8 @@ $.getJSON(noosferoAPI)
77 $.ajax({ 77 $.ajax({
78 type: 'post', 78 type: 'post',
79 url: host + '/api/v1/articles/' + proposal_id + '/children', 79 url: host + '/api/v1/articles/' + proposal_id + '/children',
80 - data: $('#'+this.id).serialize() 80 + data: $('#'+this.id).serialize(),
  81 + headers: {"Private-Token": private_token}
81 }) 82 })
82 .done(function( data ) { 83 .done(function( data ) {
83 }) 84 })
@@ -95,7 +96,7 @@ $.getJSON(noosferoAPI) @@ -95,7 +96,7 @@ $.getJSON(noosferoAPI)
95 96
96 function loadRandomProposal(topic_id, private_token) { 97 function loadRandomProposal(topic_id, private_token) {
97 var url = host + '/api/v1/articles/' + topic_id + '/children' + '?private_token=' + private_token + '&limit=1&order=random()&_='+new Date().getTime(); 98 var url = host + '/api/v1/articles/' + topic_id + '/children' + '?private_token=' + private_token + '&limit=1&order=random()&_='+new Date().getTime();
98 - $.getJSON(url).done(function( data ) { 99 + $.ajax({url: url, dataType: 'json', headers: {"Private-Token": private_token} }).done(function( data ) {
99 var article = data.articles.length > 0 ? data.articles[0] : null; 100 var article = data.articles.length > 0 ? data.articles[0] : null;
100 $('.support-proposal-container').html(supportProposalTemplate(article)); 101 $('.support-proposal-container').html(supportProposalTemplate(article));
101 $(document.body).off('click', '.vote-actions .like'); 102 $(document.body).off('click', '.vote-actions .like');
@@ -103,7 +104,8 @@ function loadRandomProposal(topic_id, private_token) { @@ -103,7 +104,8 @@ function loadRandomProposal(topic_id, private_token) {
103 $.ajax({ 104 $.ajax({
104 type: 'post', 105 type: 'post',
105 url: host + '/api/v1/articles/' + article.id + '/vote', 106 url: host + '/api/v1/articles/' + article.id + '/vote',
106 - data: {value: $(this).data('vote-value'), private_token: private_token} 107 + data: {value: $(this).data('vote-value')},
  108 + headers: {"Private-Token": private_token}
107 }).done(function( data ) { 109 }).done(function( data ) {
108 loadRandomProposal(topic_id, private_token); 110 loadRandomProposal(topic_id, private_token);
109 }); 111 });