Merge pull request #4 from brewfactory/fix/log-action

Fix log action
brewfactory · Nov 5, 2014 · edfe3f7 · edfe3f7
2 parents fe51c92 + 26413c5
commit edfe3f7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 14 deletions.
diff --git 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"
@@ -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",

diff --git 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
@@ -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);
         }