[icinga-checkins] icinga.org: icinga-web/next: Filtering window: only apply current filter from baseParams when not null (refs #3268)

git at icinga.org git at icinga.org
Tue Mar 26 14:45:23 CET 2013


Module: icinga-web
Branch: next
Commit: 7ad675210820201bd61d6df9ad7f173a536c53ae
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=7ad675210820201bd61d6df9ad7f173a536c53ae

Author: Markus Frosch <markus at lazyfrosch.de>
Date:   Tue Mar 26 14:44:27 2013 +0100

Filtering window: only apply current filter from baseParams when not null (refs #3268)

---

 .../Cronks/lib/js/Cronk/grid/MetaGridPanel.js      |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/app/modules/Cronks/lib/js/Cronk/grid/MetaGridPanel.js b/app/modules/Cronks/lib/js/Cronk/grid/MetaGridPanel.js
index 04fc61d..4a2383b 100644
--- a/app/modules/Cronks/lib/js/Cronk/grid/MetaGridPanel.js
+++ b/app/modules/Cronks/lib/js/Cronk/grid/MetaGridPanel.js
@@ -671,7 +671,8 @@ Ext.ns("Cronk.grid");
                     handler: function(cmp,state) {
                         Ext.getCmp('west-frame').resetCronkView();
                         // update filter window with current filter
-                        this.filterHdl.updateFromJsonString(this.store.baseParams.filter_json);
+                        if(this.store.baseParams.filter_json && this.store.baseParams.filter_json != 'null')
+                            this.filterHdl.updateFromJsonString(this.store.baseParams.filter_json);
                         this.filterHdl.show();
                     },
                     scope: this





More information about the icinga-checkins mailing list