From f8ae2f2f25253cee84ed21afc00a31727eede09e Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Thu, 21 Feb 2013 14:57:40 +0000
Subject: [PATCH] fix error message when cannot validate ldap connection

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1448674 13f79535-47bb-0310-9956-ffa450edef68
---
 .../main/webapp/js/archiva/general-admin.js   | 35 ++++++++++++-------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js
index 6df885ca8..58aa00ec5 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js
@@ -1439,14 +1439,20 @@ define("archiva.general-admin",["jquery","i18n","utils","jquery.tmpl","knockout"
                  displaySuccessMessage(message);
                },
                error: function(data) {
-                 var res = $.parseJSON(data.responseText);
-                 displayRestError(res);
-               },
-               complete:function(data){
-                 removeMediumSpinnerImg(userMessages);
-                 btn.button('reset');
+                 try{
+                   var res = $.parseJSON(data.responseText);
+                   displayRestError(res);
+                 }catch (e){
+                   displayErrorMessage( $.i18n.prop("error.500"));
+                 }
+
                }
              }
+      ).always(
+        function(data){
+          removeMediumSpinnerImg(userMessages);
+          btn.button('reset');
+        }
       );
     }
 
@@ -1468,14 +1474,19 @@ define("archiva.general-admin",["jquery","i18n","utils","jquery.tmpl","knockout"
                  displaySuccessMessage(message);
                },
                error: function(data) {
-                 var res = $.parseJSON(data.responseText);
-                 displayRestError(res);
-               },
-               complete:function(data){
-                 removeMediumSpinnerImg(userMessages);
-                 btn.button('reset');
+                 try{
+                   var res = $.parseJSON(data.responseText);
+                   displayRestError(res);
+                 }catch (e){
+                   displayErrorMessage( $.i18n.prop("error.500"));
+                 }
                }
              }
+      ).always(
+        function(data){
+          removeMediumSpinnerImg(userMessages);
+          btn.button('reset');
+        }
       );
     }
 
-- 
2.39.5