From f81ab4f5d1badb878e5b36d8ae7c85f44115ccdd Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Mon, 5 Sep 2011 11:49:23 +0200 Subject: [PATCH] clear filter after repository creation, see #48 --- .../js/repository/sonia.repository.grid.js | 7 +++++++ .../js/repository/sonia.repository.panel.js | 16 +++++++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) 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 7c64d482ca..f8fe3a6212 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 @@ -123,6 +123,13 @@ Sonia.repository.Grid = Ext.extend(Sonia.rest.Grid, { this.filterStore(); }, + clearStoreFilter: function(){ + this.searchValue = null; + this.typeFilter = null; + this.getStore().clearFilter(); + }, + + filterStore: function(){ var store = this.getStore(); if ( ! this.searchValue && ! this.typeFilter ){ diff --git a/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.panel.js b/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.panel.js index 59fde09254..948b4c5840 100644 --- a/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.panel.js +++ b/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.panel.js @@ -87,6 +87,7 @@ Sonia.repository.Panel = Ext.extend(Sonia.rest.Panel, { xtype: 'label', text: 'Filter: ' }, ' ', { + id: 'repositoryTypeFilter', xtype: 'combo', hiddenName : 'type', typeAhead: true, @@ -112,6 +113,7 @@ Sonia.repository.Panel = Ext.extend(Sonia.rest.Panel, { xtype: 'label', text: 'Search: ' }, ' ',{ + id: 'repositorySearch', xtype: 'textfield', enableKeyEvents: true, listeners: { @@ -218,12 +220,24 @@ Sonia.repository.Panel = Ext.extend(Sonia.rest.Panel, { scope: this }, created: { - fn: this.reload, + fn: this.clearRepositoryFilter, scope: this } } }]); }, + + clearRepositoryFilter: function(){ + if (debug){ + console.debug('clear repository filter'); + } + Ext.getCmp('repositorySearch').setValue(''); + Ext.getCmp('repositoryTypeFilter').setValue(''); + var grid = Ext.getCmp('repositoryGrid'); + grid.clearStoreFilter(); + grid.reload(); + + }, reload: function(){ Ext.getCmp('repositoryGrid').reload();