From de77ae61e4fa9f2c95a527bdee0aac2dcbd13e86 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Tue, 13 Mar 2012 21:09:30 +0100 Subject: [PATCH] use handleRestFailure instead of handleFailure --- .../js/config/sonia.config.scmconfigpanel.js | 8 ++++---- .../js/config/sonia.config.simpleconfigform.js | 8 ++++---- .../resources/js/group/sonia.group.formpanel.js | 8 ++++---- .../webapp/resources/js/group/sonia.group.panel.js | 4 ++-- .../js/panel/sonia.panel.syntaxhighlighterpanel.js | 4 ++-- .../resources/js/plugin/sonia.plugin.center.js | 12 ++++++------ .../js/repository/sonia.repository.commitpanel.js | 4 ++-- .../js/repository/sonia.repository.importwindow.js | 8 ++++---- .../resources/js/repository/sonia.repository.js | 4 ++-- .../js/repository/sonia.repository.panel.js | 4 ++-- .../webapp/resources/js/rest/sonia.rest.jsonstore.js | 4 ++-- .../webapp/resources/js/user/sonia.user.formpanel.js | 8 ++++---- .../webapp/resources/js/user/sonia.user.panel.js | 4 ++-- 13 files changed, 40 insertions(+), 40 deletions(-) diff --git a/scm-webapp/src/main/webapp/resources/js/config/sonia.config.scmconfigpanel.js b/scm-webapp/src/main/webapp/resources/js/config/sonia.config.scmconfigpanel.js index aa49d48aac..78ad33cc14 100644 --- a/scm-webapp/src/main/webapp/resources/js/config/sonia.config.scmconfigpanel.js +++ b/scm-webapp/src/main/webapp/resources/js/config/sonia.config.scmconfigpanel.js @@ -205,8 +205,8 @@ Sonia.config.ScmConfigPanel = Ext.extend(Sonia.config.ConfigPanel,{ }, failure: function(result){ this.el.unmask(); - main.handleFailure( - result.status, + main.handleRestFailure( + result, this.errorTitleText, this.errorMsgText ); @@ -234,8 +234,8 @@ Sonia.config.ScmConfigPanel = Ext.extend(Sonia.config.ConfigPanel,{ failure: function(result){ el.unmask(); clearTimeout(tid); - main.handleFailure( - result.status, + main.handleRestFailure( + result, this.errorTitleText, this.errorMsgText ); diff --git a/scm-webapp/src/main/webapp/resources/js/config/sonia.config.simpleconfigform.js b/scm-webapp/src/main/webapp/resources/js/config/sonia.config.simpleconfigform.js index 54739e9a60..224b722e20 100644 --- a/scm-webapp/src/main/webapp/resources/js/config/sonia.config.simpleconfigform.js +++ b/scm-webapp/src/main/webapp/resources/js/config/sonia.config.simpleconfigform.js @@ -54,8 +54,8 @@ Sonia.config.SimpleConfigForm = Ext.extend(Sonia.config.ConfigForm,{ }, failure: function(result){ this.el.unmask(); - main.handleFailure( - result.status, + main.handleRestFailure( + result, null, this.failedText ); @@ -79,8 +79,8 @@ Sonia.config.SimpleConfigForm = Ext.extend(Sonia.config.ConfigForm,{ failure: function(result){ el.unmask(); clearTimeout(tid); - main.handleFailure( - result.status, + main.handleRestFailure( + result, null, this.failedText ); diff --git a/scm-webapp/src/main/webapp/resources/js/group/sonia.group.formpanel.js b/scm-webapp/src/main/webapp/resources/js/group/sonia.group.formpanel.js index 825d6a33ea..cf754a0945 100644 --- a/scm-webapp/src/main/webapp/resources/js/group/sonia.group.formpanel.js +++ b/scm-webapp/src/main/webapp/resources/js/group/sonia.group.formpanel.js @@ -81,8 +81,8 @@ Sonia.group.FormPanel = Ext.extend(Sonia.rest.FormPanel,{ this.fireEvent('updateFailed', group); clearTimeout(tid); el.unmask(); - main.handleFailure( - result.status, + main.handleRestFailure( + result, this.errorTitleText, this.updateErrorMsgText ); @@ -124,8 +124,8 @@ Sonia.group.FormPanel = Ext.extend(Sonia.rest.FormPanel,{ this.fireEvent('creationFailed', item); clearTimeout(tid); el.unmask(); - main.handleFailure( - result.status, + main.handleRestFailure( + result, this.errorTitleText, this.createErrorMsgText ); diff --git a/scm-webapp/src/main/webapp/resources/js/group/sonia.group.panel.js b/scm-webapp/src/main/webapp/resources/js/group/sonia.group.panel.js index f2971d16a8..af03e43741 100644 --- a/scm-webapp/src/main/webapp/resources/js/group/sonia.group.panel.js +++ b/scm-webapp/src/main/webapp/resources/js/group/sonia.group.panel.js @@ -119,8 +119,8 @@ Sonia.group.Panel = Ext.extend(Sonia.rest.Panel, { this.resetPanel(); }, failure: function(result){ - main.handleFailure( - result.status, + main.handleRestFailure( + result, this.errorTitleText, this.errorMsgText ); diff --git a/scm-webapp/src/main/webapp/resources/js/panel/sonia.panel.syntaxhighlighterpanel.js b/scm-webapp/src/main/webapp/resources/js/panel/sonia.panel.syntaxhighlighterpanel.js index 20cf70d5a8..adb2dfc198 100644 --- a/scm-webapp/src/main/webapp/resources/js/panel/sonia.panel.syntaxhighlighterpanel.js +++ b/scm-webapp/src/main/webapp/resources/js/panel/sonia.panel.syntaxhighlighterpanel.js @@ -214,8 +214,8 @@ Sonia.panel.SyntaxHighlighterPanel = Ext.extend(Ext.Panel, { this.highlight(); }, failure: function(result){ - main.handleFailure( - result.status, + main.handleRestFailure( + result, this.loadErrorTitleText, this.loadErrorMsgText ); diff --git a/scm-webapp/src/main/webapp/resources/js/plugin/sonia.plugin.center.js b/scm-webapp/src/main/webapp/resources/js/plugin/sonia.plugin.center.js index 542ad0a6ba..11113e2601 100644 --- a/scm-webapp/src/main/webapp/resources/js/plugin/sonia.plugin.center.js +++ b/scm-webapp/src/main/webapp/resources/js/plugin/sonia.plugin.center.js @@ -99,8 +99,8 @@ Sonia.plugin.Center = Ext.extend(Ext.util.Observable, { console.debug('plugin installation failed'); } loadingBox.hide(); - main.handleFailure( - result.status, + main.handleRestFailure( + result, this.errorTitleText, this.installFailedText ); @@ -133,8 +133,8 @@ Sonia.plugin.Center = Ext.extend(Ext.util.Observable, { console.debug('plugin uninstallation failed'); } loadingBox.hide(); - main.handleFailure( - result.status, + main.handleRestFailure( + result, this.errorTitleText, this.uninstallFailedText ); @@ -168,8 +168,8 @@ Sonia.plugin.Center = Ext.extend(Ext.util.Observable, { console.debug('plugin update failed'); } loadingBox.hide(); - main.handleFailure( - result.status, + main.handleRestFailure( + result, this.errorTitleText, this.updateFailedText ); diff --git a/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.commitpanel.js b/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.commitpanel.js index 902bd6f57b..5af2a096d1 100644 --- a/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.commitpanel.js +++ b/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.commitpanel.js @@ -120,8 +120,8 @@ Sonia.repository.CommitPanel = Ext.extend(Ext.Panel, { this.update(changeset) }, failure: function(result){ - main.handleFailure( - result.status, + main.handleRestFailure( + result, this.errorTitleText, this.errorMsgText ); diff --git a/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.importwindow.js b/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.importwindow.js index 5ce3a2545a..d3b22637d2 100644 --- a/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.importwindow.js +++ b/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.importwindow.js @@ -101,8 +101,8 @@ Sonia.repository.ImportWindow = Ext.extend(Ext.Window,{ this.doLayout(); }, failure: function(result){ - main.handleFailure( - result.status, + main.handleRestFailure( + result, this.errorTitleText, this.errorMsgText ); @@ -218,8 +218,8 @@ Sonia.repository.ImportWindow = Ext.extend(Ext.Window,{ this.appendImported(obj); }, failure: function(result){ - main.handleFailure( - result.status, + main.handleRestFailure( + result, this.errorTitleText, this.errorMsgText ); diff --git a/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.js b/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.js index 227bc0df1d..13d1d1af56 100644 --- a/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.js +++ b/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.js @@ -138,8 +138,8 @@ Sonia.repository.get = function(id, callback){ execCallback(Ext.decode(response.responseText)); }, failure: function(result){ - main.handleFailure( - result.status + main.handleRestFailure( + result ); } }); 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 e6fd526d4a..6cb2c5c728 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 @@ -206,8 +206,8 @@ Sonia.repository.Panel = Ext.extend(Sonia.rest.Panel, { this.resetPanel(); }, failure: function(result){ - main.handleFailure( - result.status, + main.handleRestFailure( + result, this.errorTitleText, this.errorMsgText ); diff --git a/scm-webapp/src/main/webapp/resources/js/rest/sonia.rest.jsonstore.js b/scm-webapp/src/main/webapp/resources/js/rest/sonia.rest.jsonstore.js index 7563927ffb..4227062c9e 100644 --- a/scm-webapp/src/main/webapp/resources/js/rest/sonia.rest.jsonstore.js +++ b/scm-webapp/src/main/webapp/resources/js/rest/sonia.rest.jsonstore.js @@ -51,8 +51,8 @@ Sonia.rest.JsonStore = Ext.extend( Ext.data.JsonStore, { if (debug){ console.debug( 'error during store load, status: ' + status ); } - main.handleFailure( - status, + main.handleRestFailure( + response, this.errorTitleText, this.errorMsgText ); diff --git a/scm-webapp/src/main/webapp/resources/js/user/sonia.user.formpanel.js b/scm-webapp/src/main/webapp/resources/js/user/sonia.user.formpanel.js index 580ef9f33d..470e0ab168 100644 --- a/scm-webapp/src/main/webapp/resources/js/user/sonia.user.formpanel.js +++ b/scm-webapp/src/main/webapp/resources/js/user/sonia.user.formpanel.js @@ -134,8 +134,8 @@ Sonia.user.FormPanel = Ext.extend(Sonia.rest.FormPanel,{ this.execCallback(this.onUpdate, item); }, failure: function(result){ - main.handleFailure( - result.status, + main.handleRestFailure( + result, this.errorTitleText, this.updateErrorMsgText ); @@ -165,8 +165,8 @@ Sonia.user.FormPanel = Ext.extend(Sonia.rest.FormPanel,{ this.execCallback(this.onCreate, user); }, failure: function(result){ - main.handleFailure( - result.status, + main.handleRestFailure( + result, this.errorTitleText, this.createErrorMsgText ); diff --git a/scm-webapp/src/main/webapp/resources/js/user/sonia.user.panel.js b/scm-webapp/src/main/webapp/resources/js/user/sonia.user.panel.js index 8801343be3..a3ad2667ed 100644 --- a/scm-webapp/src/main/webapp/resources/js/user/sonia.user.panel.js +++ b/scm-webapp/src/main/webapp/resources/js/user/sonia.user.panel.js @@ -140,8 +140,8 @@ Sonia.user.Panel = Ext.extend(Sonia.rest.Panel, { this.resetPanel(); }, failure: function(result){ - main.handleFailure( - result.status, + main.handleRestFailure( + result, this.errorTitleText, this.errorMsgText );