Просмотр исходного кода

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

Rashid Khan 12 лет назад
Родитель
Сommit
cbdd3965cc
1 измененных файлов с 6 добавлено и 2 удалено
  1. 6 2
      src/app/services/filterSrv.js

+ 6 - 2
src/app/services/filterSrv.js

@@ -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);