Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-03-06 20:30:52 +01:00
Code Issues Packages Projects Releases Activity

add proxy excludes to user interface

Browse Source
This commit is contained in:
Sebastian Sdorra
2012-12-09 15:17:34 +01:00
parent 28c1d0b9d9
commit 0805caab14
3 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
scm-core/src/main/java/sonia/scm/config/ScmConfiguration.java
View File

@@ -163,6 +163,7 @@ public class ScmConfiguration
this.proxyServer = other.proxyServer;
this.proxyUser = other.proxyUser;
this.proxyPassword = other.proxyPassword;
this.proxyExcludes = other.proxyExcludes;
this.forceBaseUrl = other.forceBaseUrl;
this.baseUrl = other.baseUrl;
this.disableGroupingGrid = other.disableGroupingGrid;

14
scm-webapp/src/main/webapp/resources/js/config/sonia.config.scmconfigpanel.js
View File

@@ -54,6 +54,7 @@ Sonia.config.ScmConfigPanel = Ext.extend(Sonia.config.ConfigPanel,{
proxyPortText: 'Proxy Port',
proxyUserText: 'Proxy User',
proxyPasswordText: 'Proxy Password',
proxyExcludesText: 'Proxy Excludes',
baseUrlText: 'Base Url',
forceBaseUrlText: 'Force Base Url',
disableGroupingGridText: 'Disable repository Groups',
@@ -79,6 +80,7 @@ Sonia.config.ScmConfigPanel = Ext.extend(Sonia.config.ConfigPanel,{
proxyPortHelpText: 'The proxy port',
proxyUserHelpText: 'The username for the proxy server authentication.',
proxyPasswordHelpText: 'The password for the proxy server authentication.',
proxyExcludesHelpText: 'A comma separated list of glob patterns for hostnames which should be excluded from proxy settings.',
baseUrlHelpText: 'The url of the application (with context path) i.e. http://localhost:8080/scm',
forceBaseUrlHelpText: 'Redirects to the base url if the request comes from a other url',
disableGroupingGridHelpText: 'Disable repository Groups. A complete page reload is required after a change of this value.',
@@ -146,6 +148,7 @@ Sonia.config.ScmConfigPanel = Ext.extend(Sonia.config.ConfigPanel,{
Ext.getCmp('proxyPort').setDisabled( ! this.checked );
Ext.getCmp('proxyUser').setDisabled( ! this.checked );
Ext.getCmp('proxyPassword').setDisabled( ! this.checked );
Ext.getCmp('proxyExcludes').setDisabled( ! this.checked );
}
}
},{
@@ -181,6 +184,14 @@ Sonia.config.ScmConfigPanel = Ext.extend(Sonia.config.ConfigPanel,{
disabled: true,
helpText: this.proxyPasswordHelpText,
allowBlank: true
},{
id: 'proxyExcludes',
xtype: 'textfield',
fieldLabel: this.proxyExcludesText,
name: 'proxy-excludes',
disabled: true,
helpText: this.proxyExcludesHelpText,
allowBlank: true
},{
xtype : 'textfield',
fieldLabel : this.adminGroupsText,
@@ -230,6 +241,9 @@ Sonia.config.ScmConfigPanel = Ext.extend(Sonia.config.ConfigPanel,{
if ( obj.enableProxy ){
Ext.getCmp('proxyServer').setDisabled(false);
Ext.getCmp('proxyPort').setDisabled(false);
Ext.getCmp('proxyUser').setDisabled(false);
Ext.getCmp('proxyPassword').setDisabled(false);
Ext.getCmp('proxyExcludes').setDisabled(false);
}
clearTimeout(tid);
el.unmask();

2
scm-webapp/src/main/webapp/resources/js/i18n/de.js
View File

@@ -303,6 +303,7 @@ if (Sonia.config.ScmConfigPanel){
proxyPortText: 'Proxy Port',
proxyUserText: 'Proxy User',
proxyPasswordText: 'Proxy Passwort',
proxyExcludesText: 'Proxy Ausnahmen',
baseUrlText: 'Basis-URL',
forceBaseUrlText: 'Basis-URL forcieren',
disableGroupingGridText: 'Repository-Gruppierung deaktivieren',
@@ -333,6 +334,7 @@ if (Sonia.config.ScmConfigPanel){
proxyPortHelpText: 'Der Proxy-Port',
proxyUserHelpText: 'Der Benutzername für die Authentifizierung am Proxy-Server.',
proxyPasswordHelpText: 'Das Passwort für die Authentifizierung am Proxy-Server.',
proxyExcludesHelpText: 'Eine Komma-separierte liste von Glob-Patterns für servername die von den Proxy-Einstellungen ausgenommen werden sollen',
baseUrlHelpText: 'Die vollständige URL des Server, inclusive Context-Pfad z.B.: http://localhost:8080/scm.',
forceBaseUrlHelpText: 'Leitet alle Zugriffe die nicht von der Basis-URL kommen auf die Basis-URL um.',
disableGroupingGridHelpText: 'Repository grupierung deaktivieren. Wenn dieser Wert verändert wird muss die Seite neu geladen werden.',