From 55f5d959fff8ee20e43861e899449f83e4c2b32b Mon Sep 17 00:00:00 2001 From: diminator Date: Wed, 30 Sep 2015 11:26:31 +0200 Subject: [PATCH] PR fixes --- js/actions/coa_actions.js | 10 ++++------ js/components/ascribe_detail/edition.js | 12 ++++-------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/js/actions/coa_actions.js b/js/actions/coa_actions.js index 8249f730..da279bc6 100644 --- a/js/actions/coa_actions.js +++ b/js/actions/coa_actions.js @@ -13,7 +13,7 @@ class CoaActions { ); } - fetchOne(id) { + fetchOrCreate(id, bitcoinId) { return Q.Promise((resolve, reject) => { CoaFetcher.fetchOne(id) .then((res) => { @@ -22,10 +22,8 @@ class CoaActions { resolve(res.coa); } else { - this.actions.updateCoa(null); - resolve(null); + this.actions.create(bitcoinId); } - }) .catch((err) => { console.logGlobal(err); @@ -35,9 +33,9 @@ class CoaActions { }); } - create(edition) { + create(bitcoinId) { return Q.Promise((resolve, reject) => { - CoaFetcher.create(edition.bitcoin_id) + CoaFetcher.create(bitcoinId) .then((res) => { this.actions.updateCoa(res.coa); }) diff --git a/js/components/ascribe_detail/edition.js b/js/components/ascribe_detail/edition.js index aa82beb6..7f700c42 100644 --- a/js/components/ascribe_detail/edition.js +++ b/js/components/ascribe_detail/edition.js @@ -336,17 +336,13 @@ let CoaDetails = React.createClass({ }, componentDidMount() { + let { edition } = this.props; CoaStore.listen(this.onChange); - if(this.props.edition.coa) { - CoaActions.fetchOne(this.props.edition.coa) - .then((res) => { - if (res === null){ - CoaActions.create(this.props.edition); - } - }); + if(edition.coa) { + CoaActions.fetchOrCreate(edition.coa, edition.bitcoin_id); } else { - CoaActions.create(this.props.edition); + CoaActions.create(edition.bitcoin_id); } },