fixing wrong transactions count in info block #51

gochain · Jul 10, 2018 · 3e0edf3 · 3e0edf3
1 parent 3cc48e7
commit 3e0edf3
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/public/js/controllers/AddressController.js b/public/js/controllers/AddressController.js
@@ -48,8 +48,8 @@ angular.module('BlocksApp').controller('AddressController', function($stateParam
           data: { "addr": $scope.addrHash, "count": count }
         },
         "lengthMenu": [
-                    [10, 20, 50, 100, 150, -1],
-                    [10, 20, 50, 100, 150, "All"] // change per page values here
+                    [10, 20, 50, 100, 250],
+                    [10, 20, 50, 100, 250] // change per page values here
                 ],
         "pageLength": 20,
         "order": [

diff --git a/routes/index.js b/routes/index.js
@@ -93,20 +93,20 @@ var getAddr = function (req, res) {
   var limit = parseInt(req.body.length);
   var start = parseInt(req.body.start);
 
-  var data = { draw: parseInt(req.body.draw), recordsFiltered: count, recordsTotal: count };
 
   var addrFind = Transaction.find({ $or: [{ "to": addr }, { "from": addr }] })
-
-  addrFind.lean(true).sort('-blockNumber').skip(start).limit(limit)
-    .exec("find", function (err, docs) {
-      if (docs)
-        data.data = filters.filterTX(docs, addr);
-      else
-        data.data = [];
-      res.write(JSON.stringify(data));
-      res.end();
-    });
-
+  addrFind.exec("count", function (err, count) {
+    var data = { draw: parseInt(req.body.draw), recordsFiltered: count, recordsTotal: count };    
+    addrFind.lean(true).sort('-blockNumber').skip(start).limit(limit)
+      .exec("find", function (err, docs) {
+        if (docs)
+          data.data = filters.filterTX(docs, addr);
+        else
+          data.data = [];
+        res.write(JSON.stringify(data));
+        res.end();
+      });
+  });
 };