From 7f806d34dc1ae4e4855a000d0c98f5d063791077 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Thu, 21 Feb 2013 14:36:18 +0000 Subject: [PATCH] add error message in case of error 500 git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1448653 13f79535-47bb-0310-9956-ffa450edef68 --- .../archiva-webapp/src/main/webapp/js/archiva/startup.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/startup.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/startup.js index e40a1a310..a1df1613e 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/startup.js +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/startup.js @@ -49,7 +49,12 @@ function(jquery,sammy,utils) { removeSmallSpinnerImg(); removeMediumSpinnerImg("#main-content"); clearUserMessages(); - displayRestError($.parseJSON(data.responseText)); + try { + displayRestError($.parseJSON(data.responseText)); + } catch (e) { + //maybe not a json reponse + displayErrorMessage($.i18n.prop('error.500')); + } }, 204: function(){ remoteLogInfo(null,"found 204:"+this.url); -- 2.39.5