Commit 60a8fe31 by Torkel Ödegaard

Fixes #297, filter remove fix

parent 93ab2a93
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div class='filtering-container'> <div class='filtering-container'>
<div ng-repeat="filter in filterList" class="small filter-panel-filter"> <div ng-repeat="filter in filterSrv.list" class="small filter-panel-filter">
<div> <div>
<i class="filter-action pointer icon-remove" bs-tooltip="'Remove'" ng-click="remove(filter)"></i> <i class="filter-action pointer icon-remove" bs-tooltip="'Remove'" ng-click="remove(filter)"></i>
<i class="filter-action pointer icon-edit" ng-hide="filter.editing" bs-tooltip="'Edit'" ng-click="filter.editing = true"></i> <i class="filter-action pointer icon-edit" ng-hide="filter.editing" bs-tooltip="'Edit'" ng-click="filter.editing = true"></i>
......
...@@ -27,7 +27,7 @@ function (angular, app, _) { ...@@ -27,7 +27,7 @@ function (angular, app, _) {
_.defaults($scope.panel,_d); _.defaults($scope.panel,_d);
$scope.init = function() { $scope.init = function() {
$scope.filterList = filterSrv.list; $scope.filterSrv = filterSrv;
}; };
$scope.remove = function(filter) { $scope.remove = function(filter) {
...@@ -40,7 +40,7 @@ function (angular, app, _) { ...@@ -40,7 +40,7 @@ function (angular, app, _) {
}; };
$scope.applyFilterToOtherFilters = function(updatedFilter) { $scope.applyFilterToOtherFilters = function(updatedFilter) {
_.each($scope.filterList, function(filter) { _.each(filterSrv.list, function(filter) {
if (filter === updatedFilter) { if (filter === updatedFilter) {
return; return;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment