From e734ff82680ec04ee665e4e99d577feab176c31a Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Wed, 28 Jun 2017 22:01:11 +0200 Subject: [PATCH] removed unnecessary json url extension --- .../src/main/resources/sonia/scm/git.config.js | 2 +- .../src/main/resources/sonia/scm/hg.config-wizard.js | 8 ++++---- .../src/main/resources/sonia/scm/hg.config.js | 6 +++--- .../src/main/resources/sonia/scm/svn.config.js | 2 +- .../main/webapp/resources/js/group/sonia.group.grid.js | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/scm-plugins/scm-git-plugin/src/main/resources/sonia/scm/git.config.js b/scm-plugins/scm-git-plugin/src/main/resources/sonia/scm/git.config.js index 9e038e4dee..45d347aa88 100644 --- a/scm-plugins/scm-git-plugin/src/main/resources/sonia/scm/git.config.js +++ b/scm-plugins/scm-git-plugin/src/main/resources/sonia/scm/git.config.js @@ -60,7 +60,7 @@ Sonia.git.ConfigPanel = Ext.extend(Sonia.config.SimpleConfigForm, { var config = { title : this.titleText, - configUrl: restUrl + 'config/repositories/git.json', + configUrl: restUrl + 'config/repositories/git', items : [{ xtype: 'textfield', name: 'repositoryDirectory', diff --git a/scm-plugins/scm-hg-plugin/src/main/resources/sonia/scm/hg.config-wizard.js b/scm-plugins/scm-hg-plugin/src/main/resources/sonia/scm/hg.config-wizard.js index 5c867b8830..9a42c5eb1d 100644 --- a/scm-plugins/scm-hg-plugin/src/main/resources/sonia/scm/hg.config-wizard.js +++ b/scm-plugins/scm-hg-plugin/src/main/resources/sonia/scm/hg.config-wizard.js @@ -136,7 +136,7 @@ Sonia.hg.ConfigWizardPanel = Ext.extend(Ext.Panel,{ var packageStore = new Ext.data.JsonStore({ storeId: 'pkgStore', proxy: new Ext.data.HttpProxy({ - url: restUrl + 'config/repositories/hg/packages.json', + url: restUrl + 'config/repositories/hg/packages', disableCaching: false }), fields: [ 'id', 'hg-version', 'python-version', 'size' ], @@ -151,7 +151,7 @@ Sonia.hg.ConfigWizardPanel = Ext.extend(Ext.Panel,{ var hgInstallationStore = new Ext.data.Store({ proxy: new Ext.data.HttpProxy({ - url: restUrl + 'config/repositories/hg/installations/hg.json' + url: restUrl + 'config/repositories/hg/installations/hg' }), fields: [ 'path' ], reader: new Sonia.hg.InstallationJsonReader(), @@ -161,7 +161,7 @@ Sonia.hg.ConfigWizardPanel = Ext.extend(Ext.Panel,{ var pythonInstallationStore = new Ext.data.Store({ proxy: new Ext.data.HttpProxy({ - url: restUrl + 'config/repositories/hg/installations/python.json' + url: restUrl + 'config/repositories/hg/installations/python' }), fields: [ 'path' ], reader: new Sonia.hg.InstallationJsonReader(), @@ -370,7 +370,7 @@ Sonia.hg.ConfigWizardPanel = Ext.extend(Ext.Panel,{ }); Ext.Ajax.request({ - url: restUrl + 'config/repositories/hg/packages/' + pkg + '.json', + url: restUrl + 'config/repositories/hg/packages/' + pkg, method: 'POST', scope: this, timeout: 900000, // 15min diff --git a/scm-plugins/scm-hg-plugin/src/main/resources/sonia/scm/hg.config.js b/scm-plugins/scm-hg-plugin/src/main/resources/sonia/scm/hg.config.js index f8aa46e0a8..3fe5202a10 100644 --- a/scm-plugins/scm-hg-plugin/src/main/resources/sonia/scm/hg.config.js +++ b/scm-plugins/scm-hg-plugin/src/main/resources/sonia/scm/hg.config.js @@ -125,7 +125,7 @@ Sonia.hg.ConfigPanel = Ext.extend(Sonia.config.ConfigForm, { if (debug){ console.debug( 'load config from wizard and submit to server' ); } - self.loadConfig( self.el, 'config/repositories/hg/auto-configuration.json', 'POST', config ); + self.loadConfig( self.el, 'config/repositories/hg/auto-configuration', 'POST', config ); } else { if (debug){ console.debug( 'reload config' ); @@ -146,7 +146,7 @@ Sonia.hg.ConfigPanel = Ext.extend(Sonia.config.ConfigForm, { onSubmit: function(values){ this.el.mask(this.submitText); Ext.Ajax.request({ - url: restUrl + 'config/repositories/hg.json', + url: restUrl + 'config/repositories/hg', method: 'POST', jsonData: values, scope: this, @@ -162,7 +162,7 @@ Sonia.hg.ConfigPanel = Ext.extend(Sonia.config.ConfigForm, { }, onLoad: function(el){ - this.loadConfig(el, 'config/repositories/hg.json', 'GET'); + this.loadConfig(el, 'config/repositories/hg', 'GET'); }, loadConfig: function(el, url, method, config){ diff --git a/scm-plugins/scm-svn-plugin/src/main/resources/sonia/scm/svn.config.js b/scm-plugins/scm-svn-plugin/src/main/resources/sonia/scm/svn.config.js index 4d59f41807..e379ed38f6 100644 --- a/scm-plugins/scm-svn-plugin/src/main/resources/sonia/scm/svn.config.js +++ b/scm-plugins/scm-svn-plugin/src/main/resources/sonia/scm/svn.config.js @@ -55,7 +55,7 @@ Sonia.svn.ConfigPanel = Ext.extend(Sonia.config.SimpleConfigForm, { var config = { title : this.titleText, - configUrl: restUrl + 'config/repositories/svn.json', + configUrl: restUrl + 'config/repositories/svn', items : [{ xtype: 'textfield', name: 'repositoryDirectory', diff --git a/scm-webapp/src/main/webapp/resources/js/group/sonia.group.grid.js b/scm-webapp/src/main/webapp/resources/js/group/sonia.group.grid.js index 7d7a20be5c..66784f3c89 100644 --- a/scm-webapp/src/main/webapp/resources/js/group/sonia.group.grid.js +++ b/scm-webapp/src/main/webapp/resources/js/group/sonia.group.grid.js @@ -45,7 +45,7 @@ Sonia.group.Grid = Ext.extend(Sonia.rest.Grid, { initComponent: function(){ var groupStore = new Sonia.rest.JsonStore({ proxy: new Ext.data.HttpProxy({ - url: restUrl + 'groups.json', + url: restUrl + 'groups', disableCaching: false }), idProperty: 'name',