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 48badcdb6af53dad361eb0fbfe30f01dd0fff841 Author: Alexis Guilbaud <guilbaud@codelutin.com> Date: Thu Mar 12 12:06:08 2015 +0100 hostpage : bouton si os non détecté --- app/app.py | 2 +- static/js/controllers/hostPageCtrl.js | 10 ++++++++++ views/hostpage.html | 3 +++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/app/app.py b/app/app.py index f712f68..3057687 100755 --- a/app/app.py +++ b/app/app.py @@ -171,6 +171,6 @@ if __name__ == '__main__': ml.load_all_monitoring_modules() ml.load_all_connection_modules() wsc = WebSocketContainer(ml.get_db()) - process_monitoring.init(ml, wsc) + #process_monitoring.init(ml, wsc) port = int(os.environ.get('PORT', 1337)) run(host='0.0.0.0', port=port, debug=True, server=GeventWebSocketServer) \ No newline at end of file diff --git a/static/js/controllers/hostPageCtrl.js b/static/js/controllers/hostPageCtrl.js index b905f2c..635d059 100644 --- a/static/js/controllers/hostPageCtrl.js +++ b/static/js/controllers/hostPageCtrl.js @@ -57,6 +57,16 @@ mumApp.controller('hostPageCtrl', function($scope, $rootScope, $routeParams, $mo }); }); + // monitoring data are updated + /*$scope.$on("hostsUpdate", function (event, args) { + $scope.$apply(function(){ + for(i=0 ; i<args.length()) ; i++){ + if(args[i][]) + $scope.items['monitoring'] = args['monitoring']; + } + }); + });*/ + // save custom informations $scope.save_custom_infos = function(){ var args = {}; diff --git a/views/hostpage.html b/views/hostpage.html index b5af0d7..2286641 100644 --- a/views/hostpage.html +++ b/views/hostpage.html @@ -37,6 +37,9 @@ ng-repeat="(key, val) in mod"> <td>{{key}}</td> <td>{{val}}</td> + <td ng-show="(key == 'os') && (val == 'unknown')"> + <button type="button" class="btn btn-info btn-xs">Please indicate the OS</button> + </td> </tr> </table> </accordion-group> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.