You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2012/01/16 14:27:03 UTC
svn commit: r1231991 - in
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js:
archiva/repositories.js archiva/utils.js redback/redback.js
Author: olamy
Date: Mon Jan 16 13:27:01 2012
New Revision: 1231991
URL: http://svn.apache.org/viewvc?rev=1231991&view=rev
Log:
fix display of error response when updating a managedRepository
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback.js
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js?rev=1231991&r1=1231990&r2=1231991&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js Mon Jan 16 13:27:01 2012
@@ -84,7 +84,8 @@ $(function() {
displaySuccessMessage($.i18n.prop('managedrepository.updated'));
},
error: function(data) {
- displayErrorMessage(data);
+ var res = $.parseJSON(data.responseText);
+ displayRestError(res);
}
}
);
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js?rev=1231991&r1=1231990&r2=1231991&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js Mon Jan 16 13:27:01 2012
@@ -216,13 +216,38 @@ $.extend($.tmpl.tag, {
});
displayRestError=function(data,idToAppend){
- if (data.archivaRestError){
- if (data.archivaRestError.errorKey){
+
+ if (data.redbackRestError){
+ displayRedbackError(archivaRestError,idToAppend)
+ }
+
+ if (data.archivaRestError && data.archivaRestError.errorKey && data.archivaRestError.errorKey.length>0){
+ $.log("with errorKey:"+dataarchivaRestError.errorKey);
displayErrorMessage($.i18n.prop( data.archivaRestError.errorKey ),idToAppend);
} else {
+ $.log("data.errorMessage:"+data.archivaRestError.errorMessage);
displayErrorMessage(data.archivaRestError.errorMessage,idToAppend);
+ }
+
+}
+
+/**
+ * display redback error from redback json error response
+ * {"redbackRestError":{"errorMessages":{"args":1,"errorKey":"user.password.violation.numeric"}}}
+ * @param obj
+ * @param idToAppend
+ */
+displayRedbackError=function(obj,idToAppend) {
+ if ($.isArray(obj.redbackRestError.errorMessages)) {
+ $.log("displayRedbackError with array");
+ for(var i=0; i<obj.redbackRestError.errorMessages.length; i++ ) {
+ if(obj.redbackRestError.errorMessages[i].errorKey) {
+ $.log("displayRedbackError with array loop");
+ displayErrorMessage($.i18n.prop( obj.redbackRestError.errorMessages[i].errorKey, obj.redbackRestError.errorMessages[i].args ),idToAppend);
+ }
}
} else {
- // redback ??
+ $.log("displayRedbackError no array");
+ displayErrorMessage($.i18n.prop( obj.redbackRestError.errorMessages.errorKey, obj.redbackRestError.errorMessages.args ),idToAppend);
}
}
\ No newline at end of file
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback.js?rev=1231991&r1=1231990&r2=1231991&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback.js Mon Jan 16 13:27:01 2012
@@ -21,27 +21,6 @@ $(function() {
// define a container object with various datas
window.redbackModel = {usersViewModel:null,userOperationNames:null,key:null,userCreate:false,i18n:$.i18n.map,rolesViewModel:null};
- /**
- * display redback error from redback json error response
- * {"redbackRestError":{"errorMessages":{"args":1,"errorKey":"user.password.violation.numeric"}}}
- * @param obj
- * @param idToAppend
- */
- displayRedbackError=function(obj,idToAppend) {
- if ($.isArray(obj.redbackRestError.errorMessages)) {
- $.log("displayRedbackError with array");
- for(var i=0; i<obj.redbackRestError.errorMessages.length; i++ ) {
- if(obj.redbackRestError.errorMessages[i].errorKey) {
- $.log("displayRedbackError with array loop");
- displayErrorMessage($.i18n.prop( obj.redbackRestError.errorMessages[i].errorKey, obj.redbackRestError.errorMessages[i].args ),idToAppend);
- }
- }
- } else {
- $.log("displayRedbackError no array");
- displayErrorMessage($.i18n.prop( obj.redbackRestError.errorMessages.errorKey, obj.redbackRestError.errorMessages.args ),idToAppend);
- }
- }
-
// unbinding
$("#user-create-form-cancel-button").on("click", function(){
$('#user-create').hide();