ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-12-23 01:39:36 +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-04 11:51:17 +02:00
commit 8a49006592
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/actions/contract_actions.js
View File

@ -39,8 +39,6 @@ class ContractActions {
contractEmail: null contractEmail: null
}); });
}); });
} else {
/* No email was entered - Ignore and keep going*/
} }
} }

2
js/actions/contract_list_actions.js
View File

@ -28,9 +28,11 @@ class ContractListActions {
return Q.Promise((resolve, reject) => { return Q.Promise((resolve, reject) => {
OwnershipFetcher.makeContractPublic(contract) OwnershipFetcher.makeContractPublic(contract)
.then((res) => { .then((res) => {
console.log('Here is the result... ');
resolve(res); resolve(res);
}) })
.catch((err)=> { .catch((err)=> {
console.log('Here we have an error');
console.logGlobal(err); console.logGlobal(err);
reject(err); reject(err);
}); });

10
js/components/ascribe_settings/contract_settings.js
View File

@ -35,10 +35,10 @@ let ContractSettings = React.createClass({
console.log(contract); console.log(contract);
ContractListActions.makeContractPublic(contract) ContractListActions.makeContractPublic(contract)
.then(( ) => ContractListActions.fetchContractList()) .then(( ) => ContractListActions.fetchContractList())
.catch((error)=>{console.log("Error ", error); .catch((error)=>{console.log('Error ', error);
let notification = new GlobalNotificationModel("Service is unavailable", 'danger', 10000); let notification = new GlobalNotificationModel('Service is unavailable', 'danger', 10000);
GlobalNotificationActions.appendGlobalNotification(notification); GlobalNotificationActions.appendGlobalNotification(notification);
}) });
}, },
getPublicContracts(){ getPublicContracts(){
return this.state.contractList.filter((contract) => contract.public); return this.state.contractList.filter((contract) => contract.public);
@ -75,7 +75,7 @@ let ContractSettings = React.createClass({
<button className="btn btn-default btn-sm margin-left-2px">UPDATE</button> <button className="btn btn-default btn-sm margin-left-2px">UPDATE</button>
<button className="btn btn-default btn-sm margin-left-2px">REMOVE</button> <button className="btn btn-default btn-sm margin-left-2px">REMOVE</button>
</span>} </span>}
/>) />);
} }
) : null } ) : null }
</div>} </div>}
@ -92,7 +92,7 @@ let ContractSettings = React.createClass({
<button className="btn btn-default btn-sm margin-left-2px" >REMOVE</button> <button className="btn btn-default btn-sm margin-left-2px" >REMOVE</button>
<button className="btn btn-default btn-sm margin-left-2px" <button className="btn btn-default btn-sm margin-left-2px"
onClick={this.makeContractPublic.bind(this, contract)}>MAKE PUBLIC</button> </span>} onClick={this.makeContractPublic.bind(this, contract)}>MAKE PUBLIC</button> </span>}
/>) />);
} }
) : null} ) : null}
</div>} </div>}