aboutsummaryrefslogtreecommitdiffstats
path: root/archiva-modules
diff options
context:
space:
mode:
authorOlivier Lamy <olamy@apache.org>2012-09-11 07:36:52 +0000
committerOlivier Lamy <olamy@apache.org>2012-09-11 07:36:52 +0000
commit1a2df0b49f118abe5af153285925ffb2422ec889 (patch)
tree27b6e9dbdd34b8f7f33218938b45251acafb0c5d /archiva-modules
parent512509f1375acdc1f50958971eeb6f5c8e473382 (diff)
downloadarchiva-1a2df0b49f118abe5af153285925ffb2422ec889.tar.gz
archiva-1a2df0b49f118abe5af153285925ffb2422ec889.zip
[MRM-1664] Validation error message not visible to user when adding Remote Repository.
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1383268 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules')
-rw-r--r--archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js4
-rw-r--r--archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/startup.js5
-rw-r--r--archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js4
3 files changed, 5 insertions, 8 deletions
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
index b9fc45186..91495f4bf 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
@@ -199,10 +199,6 @@ define("archiva.repositories",["jquery","i18n","jquery.tmpl","bootstrap","jquery
displaySuccessMessage($.i18n.prop('managedrepository.updated',self.managedRepository.id()));
activateManagedRepositoriesGridTab();
self.managedRepository.modified(false);
- },
- error: function(data) {
- var res = $.parseJSON(data.responseText);
- displayRestError(res);
}
}
);
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/startup.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/startup.js
index ae2ce0582..3d0fa332b 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/startup.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/startup.js
@@ -36,11 +36,12 @@ function() {
clearUserMessages();
displayErrorMessage($.i18n.prop('authz.karma.needed'));
},
- 500: function(){
+ 500: function(data){
removeSmallSpinnerImg();
removeMediumSpinnerImg("#main-content");
clearUserMessages();
- displayErrorMessage($.i18n.prop('error.500'));
+ displayRestError($.parseJSON(data.responseText));
+ //displayErrorMessage($.i18n.prop('error.500'));
}
}
});
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
index 9581a24bb..77a76ba97 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
@@ -281,7 +281,7 @@ require(["jquery","jquery.tmpl","i18n"], function(jquery,jqueryTmpl,i18n) {
* if not error is displayed in #user-messages div
*/
displayRestError=function(data,idToAppend){
-
+ $.log("displayRestError");
if (data.redbackRestError){
displayRedbackError(archivaRestError,idToAppend)
}
@@ -308,7 +308,7 @@ require(["jquery","jquery.tmpl","i18n"], function(jquery,jqueryTmpl,i18n) {
if (data.errorKey && data.errorKey.length>0){
displayErrorMessage($.i18n.prop( data.errorKey ),idToAppend);
} else {
- $.log("data.errorMessage:"+data.errorMessage);
+ $.log("print data.errorMessage:"+data.errorMessage);
displayErrorMessage(data.errorMessage,idToAppend);
}