ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-11-15 01:25:17 +01:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/AD-456-ikonotv-branded-page-for-registra' into AD-883-show-notificationsrequests-on-col

Browse Source
This commit is contained in:
diminator 2015-09-08 14:43:38 +02:00
commit 2a92b38a9a
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
js/actions/contract_list_actions.js
View File

@ -44,8 +44,12 @@ class ContractListActions {
resolve(res);
})
.catch( (err) => {
console.logGlobal(err);
reject(err);
if(typeof err === 'undefined') {
resolve(err);
}
else{
reject(err);
}
});
});
}

3
js/fetchers/ownership_fetcher.js
View File

@ -24,7 +24,8 @@ let OwnershipFetcher = {
},
makeContractPublic(contractObj){
return requests.put('ownership_contract', { body: contractObj, contract_id: contractObj.id });
console.log(ApiUrls.ownership_contract);
return requests.put(ApiUrls.ownership_contract, { body: contractObj, contract_id: contractObj.id });
},
deleteContract(contractObjId){

3
js/utils/requests.js
View File

@ -116,7 +116,6 @@ class Requests {
merged.headers['X-CSRFToken'] = csrftoken;
}
merged.method = verb;
return fetch(url, merged)
.then(this.unpackResponse)
.catch( () => {
@ -136,14 +135,12 @@ class Requests {
delete(url, params) {
let paramsCopy = this._merge(params);
let newUrl = this.prepareUrl(url, paramsCopy, true);
return this.request('delete', newUrl);
}
_putOrPost(url, paramsAndBody, method){
let paramsCopy = this._merge(paramsAndBody);
let params = excludePropFromObject(paramsAndBody, ['body']);
let newUrl = this.prepareUrl(url, params);
let body = null;
if (paramsCopy && paramsCopy.body) {