public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'topface/disabled-filters' into filterDefaults

Browse Source
This commit is contained in:
Rashid Khan
2013-12-03 15:01:32 -07:00
parent bdaf1b2b0c 7c74cb8307
commit cbdd3965cc
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/services/filterSrv.js
+6 -2
View File
@@ -51,8 +51,12 @@ define([
// If an id is passed, the filter at that id is updated // If an id is passed, the filter at that id is updated
this.set = function(filter,id,noRefresh) { this.set = function(filter,id,noRefresh) {
var _r; var _r;
_.defaults(filter,{mandate:'must'});
filter.active = true; _.defaults(filter,{
mandate:'must',
active: true
});
if(!_.isUndefined(id)) { if(!_.isUndefined(id)) {
if(!_.isUndefined(self.list[id])) { if(!_.isUndefined(self.list[id])) {
_.extend(self.list[id],filter); _.extend(self.list[id],filter);