Changeset 12467 for branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Status/3.3/WebApp/status

Timestamp:

06/18/15 11:56:31 (10 years ago)

Author:

dglaser

Message:

#2388: Merged trunk into HiveStatistics branch

Location:

branches/HiveStatistics/sources

Files:

• . (modified) (2 props)
• HeuristicLab.Services.WebApp.Status/3.3/WebApp/status/statusCtrl.js (modified) (1 diff)

branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Status/3.3/WebApp/status/statusCtrl.js

@@ -143 +143 @@
                     // charts are currently filled with old total/used data
                     // start temporary
-                    var usedCores = status.CoreStatus.TotalCores - status.getCoreStatus.FreeCores;
+                    var usedCores = status.CoreStatus.TotalCores - status.CoreStatus.FreeCores;
                     var usedMemory = status.MemoryStatus.TotalMemory - status.MemoryStatus.FreeMemory;
                     // end temporary