From 41df67df8b06847810538b5bb7b5054506b7d52f Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Sun, 14 Jun 2015 18:27:29 +0200 Subject: [PATCH] clear tag/branch selection, if the other one was selected --- .../sonia.repository.repositorybrowser.js | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.repositorybrowser.js b/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.repositorybrowser.js index 12464868da..7ec444222c 100644 --- a/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.repositorybrowser.js +++ b/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.repositorybrowser.js @@ -171,6 +171,7 @@ Sonia.repository.RepositoryBrowser = Ext.extend(Ext.grid.GridPanel, { }); items.push('->','Branches:', ' ',{ + id: 'branchComboBox', xtype: 'combo', valueField: 'revision', displayField: 'name', @@ -180,7 +181,7 @@ Sonia.repository.RepositoryBrowser = Ext.extend(Ext.grid.GridPanel, { store: branchStore, listeners: { select: { - fn: this.selectRev, + fn: this.selectBranch, scope: this } } @@ -208,6 +209,7 @@ Sonia.repository.RepositoryBrowser = Ext.extend(Ext.grid.GridPanel, { } items.push('Tags:', ' ',{ + id: 'tagComboBox', xtype: 'combo', valueField: 'revision', displayField: 'name', @@ -217,7 +219,7 @@ Sonia.repository.RepositoryBrowser = Ext.extend(Ext.grid.GridPanel, { store: tagStore, listeners: { select: { - fn: this.selectRev, + fn: this.selectTag, scope: this } } @@ -233,7 +235,15 @@ Sonia.repository.RepositoryBrowser = Ext.extend(Ext.grid.GridPanel, { return tbar; }, - selectRev: function(combo, rec){ + selectBranch: function(combo, rec){ + this.selectRev(rec, Ext.getCmp('tagComboBox')); + }, + + selectTag: function(combo, rec){ + this.selectRev(rec, Ext.getCmp('branchComboBox')); + }, + + selectRev: function(rec, comboToClear){ var tag = rec.get('name'); if (debug){ console.debug('select rev ' + tag); @@ -248,6 +258,11 @@ Sonia.repository.RepositoryBrowser = Ext.extend(Ext.grid.GridPanel, { this.reRenderBottomBar(this.path); this.updateHistory(); + + // clear other combobox + if (comboToClear){ + comboToClear.clearValue(); + } }, loadStore: function(store, records, extra){