This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository mum. See http://git.chorem.org/mum.git commit 1793e094f0f75b969752dc06391efc91db216249 Author: Alexis Guilbaud <guilbaud@codelutin.com> Date: Thu May 28 09:47:57 2015 +0200 bugfixes on new scan + total machines on header --- app/websocket_func.py | 1 + static/js/controllers/headCtrl.js | 13 +++++++------ static/js/controllers/scanCtrl.js | 2 +- views/index.html | 9 +++++---- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/app/websocket_func.py b/app/websocket_func.py index 1eaafff..5602f39 100644 --- a/app/websocket_func.py +++ b/app/websocket_func.py @@ -46,6 +46,7 @@ def start_first_detection(args, ml, ws): def NMAP_SCAN_DEMAND(msg, ws, ml): if msg["NMAP_SCAN_DEMAND"]["nmap_options"] == '': ml.create_empty_host(msg["NMAP_SCAN_DEMAND"]["ip_range"], ws) + ws.send(json.dumps({"SUCCESS_MODULE": "New host successfully created"})) else: if os.getegid() != 0: print "Error: Cannot run nmap without root privileges." diff --git a/static/js/controllers/headCtrl.js b/static/js/controllers/headCtrl.js index 65415f8..7e363f0 100644 --- a/static/js/controllers/headCtrl.js +++ b/static/js/controllers/headCtrl.js @@ -138,22 +138,23 @@ mumApp.controller('headCtrl', function ($scope, $rootScope, toastr, $interval, $ }; /* - * Return a vector with the number of hosts with a status of : success, warning, danger, idling + * Return a vector with the number of hosts with a status of : total, success, warning, danger, idling */ $scope.stateNumber = function () { - var res = [0,0,0,0]; + var res = [0,0,0,0,0]; for (var i = 0; i<$scope.items.length; i++) { + res[0] = $scope.items.length; if ($scope.items[i].status === "success") { - res[0]++; + res[1]++; } if ($scope.items[i].status === "warning") { - res[1]++; + res[2]++; } if ($scope.items[i].status === "danger") { - res[2]++; + res[3]++; } if ($scope.items[i].status === "idling") { - res[3]++; + res[4]++; } } return res; diff --git a/static/js/controllers/scanCtrl.js b/static/js/controllers/scanCtrl.js index 49e259e..09830bd 100644 --- a/static/js/controllers/scanCtrl.js +++ b/static/js/controllers/scanCtrl.js @@ -23,10 +23,10 @@ mumApp.controller('scanCtrl', function ($scope, $rootScope, $routeParams, $timeo }); $scope.run_detection = function (){ - $scope.ip_range = ""; var args = {}; args.ip_range = $scope.ip_range; args.nmap_options = $scope.nmap_options_input; $rootScope.$broadcast("sendViaWs", JSON.stringify({"NMAP_SCAN_DEMAND": args})); + $scope.ip_range = ""; }; }); \ No newline at end of file diff --git a/views/index.html b/views/index.html index 08cebaf..6f03c58 100644 --- a/views/index.html +++ b/views/index.html @@ -60,10 +60,11 @@ <span class="icon-bar"></span> </button> <a class="navbar-brand" href="#dashboard.html">Mum</a> - <p class="navbar-text navbar-left"><a href="#dashboard/success" style="color:green">OK : {{stateNumber()[0]}}</a></p> - <p class="navbar-text navbar-left"><a href="#dashboard/warning" style="color:orange">Warning : {{stateNumber()[1]}}</a></p> - <p class="navbar-text navbar-left"><a href="#dashboard/danger" style="color:red">KO : {{stateNumber()[2]}}</a></p> - <p class="navbar-text navbar-left"><a href="#dashboard/idling" style="color:grey">Idling : {{stateNumber()[3]}}</a></p> + <p class="navbar-text navbar-left"><a href="#dashboard" style="color:grey">Total : {{stateNumber()[0]}}</a></p> + <p class="navbar-text navbar-left"><a href="#dashboard/success" style="color:green">OK : {{stateNumber()[1]}}</a></p> + <p class="navbar-text navbar-left"><a href="#dashboard/warning" style="color:orange">Warning : {{stateNumber()[2]}}</a></p> + <p class="navbar-text navbar-left"><a href="#dashboard/danger" style="color:red">KO : {{stateNumber()[3]}}</a></p> + <p class="navbar-text navbar-left"><a href="#dashboard/idling" style="color:grey">Idling : {{stateNumber()[4]}}</a></p> <p class="navbar-text navbar-left" style="colod:white" ng-show="task_list.length > 0" -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.