[icinga-checkins] icinga.org: icinga-web/next: Readded native state, metagrid now saves columnmove in the state, fixed downtimes are working again

[git at icinga.org]

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

Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Wed Dec 19 11:37:56 2012 +0100

Readded native state, metagrid now saves columnmove in the state, fixed downtimes are working again

Conflicts:
	app/modules/Cronks/lib/js/Cronk/grid/MetaGridPanel.js

---

 .../Cronks/lib/js/Cronk/grid/MetaGridPanel.js      |    7 ++++++-
 1 files changed, 6 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 70b0a85..5075498 100755
--- a/app/modules/Cronks/lib/js/Cronk/grid/MetaGridPanel.js
+++ b/app/modules/Cronks/lib/js/Cronk/grid/MetaGridPanel.js
@@ -1013,6 +1013,7 @@ Ext.ns("Cronk.grid");
                 filter_params: this.filter_params || {},
                 filter_types: this.filter_types || {},
                 filter: this.store.baseParams.filter_json,
+                nativeState: Ext.grid.GridPanel.prototype.getState.apply(this),
                 store_origin_params: ("originParams" in store) ? store.originParams : {},
                 sortToggle: store.sortToggle,
                 sortInfo: store.sortInfo,
@@ -1082,7 +1083,11 @@ Ext.ns("Cronk.grid");
             if (state.connection) {
                 this.setConnection(state.connection);
             }
-
+            if (Ext.isObject(state.nativeState)) {
+                return Ext.grid.GridPanel.prototype.applyState.call(this, {
+                    columns: state.nativeState.columns
+                });
+            }
             return true;
         },