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