From ddfac458a4a95c375578615a0dad7112ec9e1c97 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Sat, 7 Jan 2012 14:18:54 +0100 Subject: [PATCH] fix wrong revision for sub module repository browser --- .../sonia.repository.repositorybrowser.js | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 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 cc2e0ae282..b98f17bc00 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 @@ -201,7 +201,13 @@ Sonia.repository.RepositoryBrowser = Ext.extend(Ext.grid.GridPanel, { if (debug){ console.debug('open sub repository ' + subRepository); } - var id = 'repositoryBrowser;' + subRepository + ';null;null'; + var revision = null; + var index = subRepository.indexOf(';'); + if ( index > 0 ){ + revision = subRepository.substring(index + 1); + subRepository = subRepository.substring(0, index); + } + var id = 'repositoryBrowser;' + subRepository + ';' + revision + ';null'; Sonia.repository.get(subRepository, function(repository){ var panel = Ext.getCmp(id); if (! panel){ @@ -209,7 +215,7 @@ Sonia.repository.RepositoryBrowser = Ext.extend(Ext.grid.GridPanel, { id: id, xtype: 'repositoryBrowser', repository : repository, - revision: null, + revision: revision, closable: true, autoScroll: true } @@ -323,13 +329,16 @@ Sonia.repository.RepositoryBrowser = Ext.extend(Ext.grid.GridPanel, { return url; }, - transformLink: function(url){ + transformLink: function(url, revision){ var link = null; var server = Sonia.util.getServername(url); if ( server == window.location.hostname || server == 'localhost' ){ var repositoryPath = this.getRepositoryPath( url ); if (repositoryPath){ link = 'sub:' + repositoryPath; + if (revision){ + link += ';' + revision; + } } } return link; @@ -346,7 +355,7 @@ Sonia.repository.RepositoryBrowser = Ext.extend(Ext.grid.GridPanel, { if (!subRepositoryUrl){ subRepositoryUrl = subRepository['repository-url']; } - path = this.transformLink(subRepositoryUrl); + path = this.transformLink(subRepositoryUrl, subRepository['revision']); if ( path ){ template = this.templateInternalLink; } else {