From 7def83b7b9edf3e07b4cdcc6ec16001ab90181d6 Mon Sep 17 00:00:00 2001 From: Peter Marton Date: Wed, 5 Nov 2014 13:38:46 +0100 Subject: [PATCH 1/2] Use flux-router from npm --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e6f1a97..0b3e643 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "chart.js": "^1.0.1-beta.2", "debug": "^2.0.0", "dispatchr": "^0.2.7", - "flux-router-component": "git://github.com/hekike/flux-router-component#feature/update-react-v12", + "flux-router-component": "^0.4.3", "lodash-node": "^2.4.1", "moment": "^2.8.3", "react": "^0.12.0", From 26413c572b254d810c7ea3862b9feeb3f7967913 Mon Sep 17 00:00:00 2001 From: Peter Marton Date: Wed, 5 Nov 2014 20:37:18 +0100 Subject: [PATCH 2/2] Fix find one log action --- package.json | 2 +- src/scripts/app/actions/logs/findBrew.js | 16 +++++----------- src/scripts/app/app.js | 2 +- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index 0b3e643..b737461 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "brew-ui", - "version": "1.3.0", + "version": "1.3.1", "description": "Common User Interface for the Brewfactory projects.", "authors": [ "Peter Marton, @slashdotpeter" diff --git a/src/scripts/app/actions/logs/findBrew.js b/src/scripts/app/actions/logs/findBrew.js index c0bd97f..f27cddb 100644 --- a/src/scripts/app/actions/logs/findBrew.js +++ b/src/scripts/app/actions/logs/findBrew.js @@ -15,18 +15,12 @@ module.exports = function (context, payload, done) { .then(function (resp) { var brews = resp.brews; - logFetcher.findOne({ id: brews[0]._id }).then(function (selectedResp) { - var selectedBrew = selectedResp.brews; + debug('dispatching FIND_LOG_SUCCESS', brews); + context.dispatch(LogConstants.ActionTypes.FIND_LOG_SUCCESS, brews); - debug('dispatching FIND_LOG_SUCCESS', brews); - - context.dispatch(LogConstants.ActionTypes.FIND_ONE_LOG_SUCCESS, selectedBrew); - context.dispatch(LogConstants.ActionTypes.FIND_LOG_SUCCESS, brews); - - if(typeof done === 'function') { - done(null, brews); - } - }); + if(typeof done === 'function') { + done(null, brews); + } }) .catch(function (err) { debug('FIND_LOG error', err); diff --git a/src/scripts/app/app.js b/src/scripts/app/app.js index e37e253..7963963 100644 --- a/src/scripts/app/app.js +++ b/src/scripts/app/app.js @@ -80,7 +80,7 @@ App.prototype.init = function () { } // FInd selected brew - actionContext.executeAction(findOneBrewLogAction, { id: brews[0].id }, function (err) { + actionContext.executeAction(findOneBrewLogAction, { id: brews[0]._id }, function (err) { if(err) { return reject(err); }