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 dc557b11dcdc1447ea9ef28ef8fad28075e115a5 Author: Alexis Guilbaud <guilbaud@codelutin.com> Date: Wed Apr 15 10:38:56 2015 +0200 dashboard: multiple select filter for status --- static/js/controllers/dashboardCtrl.js | 8 ++++++-- views/dashboard.html | 12 ++++++++---- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/static/js/controllers/dashboardCtrl.js b/static/js/controllers/dashboardCtrl.js index cf5b417..07df506 100644 --- a/static/js/controllers/dashboardCtrl.js +++ b/static/js/controllers/dashboardCtrl.js @@ -40,10 +40,10 @@ mumApp.controller('dashboardCtrl', function($scope, $filter, $routeParams, DataH $scope.name_filter = ''; if($routeParams.param == null){ - $scope.status_filter = ''; + $scope.status_filter = ["success", "warning", "danger"]; } else{ - $scope.status_filter = $routeParams.param; + $scope.status_filter = [$routeParams.param]; } $scope.group_filter = ''; @@ -52,6 +52,10 @@ mumApp.controller('dashboardCtrl', function($scope, $filter, $routeParams, DataH $scope.grp = "all"; + $scope.filtering_status = function(item){ + return($scope.status_filter.lastIndexOf(item.status) >= 0); + } + // Concerning the table manipulation var searchMatch = function (haystack, needle) { return !needle || haystack.toLowerCase().indexOf(needle.toLowerCase()) !== -1; diff --git a/views/dashboard.html b/views/dashboard.html index 79bde16..4e964cb 100644 --- a/views/dashboard.html +++ b/views/dashboard.html @@ -14,8 +14,7 @@ </div> <div class="col-xs-2"> <label for="status_f">Status filter</label> - <select class="form-control input-sm" id="status_f" ng-model="status_filter"> - <option></option> + <select multiple class="form-control input-sm" id="status_f" ng-model="status_filter"> <option>success</option> <option>warning</option> <option>danger</option> @@ -23,7 +22,10 @@ </div> <div class="col-xs-2"> <label for="group_f">Group filter</label> - <select class="form-control input-sm" id="group_f" ng-model="group_filter" ng-options="item for item in allGroups() | unique:'group'"> + <select class="form-control input-sm" + id="group_f" + ng-model="group_filter" + ng-options="item for item in allGroups() | unique:'group'"> </select> </div> <table class="table table-condensed table-hover"> @@ -66,7 +68,9 @@ <tbody> <tr ng-repeat="item in items | orderBy:sort.sortingOrder:sort.reverse | - filter:{addr:addr_filter, name:name_filter, status:status_filter, group:group_filter}" class={{item.status}}> <!-- group.name:group_filter --> + filter:{addr:addr_filter, name:name_filter, group:filtering_group} | + filter:filtering_status" + class={{item.status}}> <!-- group.name:group_filter --> <td><a href="#/hostpage/{{item.addr}}">{{item.addr}}</a></td> <td>{{item.name}}</td> <td>warning : {{item.warning}}<br/> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.