From efd2f36b51ff35ffcf1506f6b6a69378802b994d Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Tue, 23 Oct 2012 08:27:46 +0200 Subject: [PATCH] keep same repository group id after logout and re login --- .../resources/js/override/ext.grid.groupingview.js | 14 ++++++++++++++ .../js/repository/sonia.repository.grid.js | 1 + 2 files changed, 15 insertions(+) diff --git a/scm-webapp/src/main/webapp/resources/js/override/ext.grid.groupingview.js b/scm-webapp/src/main/webapp/resources/js/override/ext.grid.groupingview.js index 63543d71cb..080e0d2d2f 100644 --- a/scm-webapp/src/main/webapp/resources/js/override/ext.grid.groupingview.js +++ b/scm-webapp/src/main/webapp/resources/js/override/ext.grid.groupingview.js @@ -35,6 +35,7 @@ Ext.grid.GroupingView.prototype.toggleGroupExt = Ext.grid.GroupingView.prototype Ext.override(Ext.grid.GroupingView,{ storedState: null, + idPrefix: '{grid.el.id}', initTemplates : function(){ this.initTemplatesExt(); @@ -54,6 +55,19 @@ Ext.override(Ext.grid.GroupingView,{ applyState: function(state){ this.storedState = state; + }, + + getPrefix: function(field){ + var prefix; + if ( this.idPrefix == '{grid.id}' ){ + prefix = this.grid.getId(); + } else if (this.idPrefix == '{grid.el.id}') { + prefix = this.grid.getGridEl().id; + } else { + prefix = this.idPrefix; + } + prefix += '-gp-' + field + '-'; + return prefix; } }); \ No newline at end of file diff --git a/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.grid.js b/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.grid.js index b4ddf8ff7d..2cfbb6f9c4 100644 --- a/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.grid.js +++ b/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.grid.js @@ -200,6 +200,7 @@ Sonia.repository.Grid = Ext.extend(Sonia.rest.Grid, { } }, view: new Ext.grid.GroupingView({ + idPrefix: '{grid.id}', enableGrouping: ! state.clientConfig.disableGroupingGrid, enableNoGroups: false, forceFit: true,