You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2012/05/14 11:20:21 UTC
svn commit: r1338109 - in /ofbiz/branches/release12.04: ./
framework/images/webapp/images/fieldlookup.js
framework/images/webapp/images/selectall.js
Author: jleroux
Date: Mon May 14 09:20:21 2012
New Revision: 1338109
URL: http://svn.apache.org/viewvc?rev=1338109&view=rev
Log:
"Applied fix from trunk for revision: 1338101"
------------------------------------------------------------------------
r1338101 | jleroux | 2012-05-14 11:15:10 +0200 (lun., 14 mai 2012) | 2 lines
Complete r1338065, the same message existed in fieldlookup.js
Also no needs to i18n such error messages, I removed the //TODO
------------------------------------------------------------------------
Modified:
ofbiz/branches/release12.04/ (props changed)
ofbiz/branches/release12.04/framework/images/webapp/images/fieldlookup.js
ofbiz/branches/release12.04/framework/images/webapp/images/selectall.js
Propchange: ofbiz/branches/release12.04/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1338101
Modified: ofbiz/branches/release12.04/framework/images/webapp/images/fieldlookup.js
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/images/webapp/images/fieldlookup.js?rev=1338109&r1=1338108&r2=1338109&view=diff
==============================================================================
--- ofbiz/branches/release12.04/framework/images/webapp/images/fieldlookup.js (original)
+++ ofbiz/branches/release12.04/framework/images/webapp/images/fieldlookup.js Mon May 14 09:20:21 2012
@@ -292,8 +292,9 @@ function ConstructLookup(requestUrl, inp
}
},
error: function(xhr, reason, exception) {
- //TODO ... need to localize the following error message.
- alert("An error occurred while communicating with the server:\n\n\nreason=" + reason + "\n\nexception=" + exception);
+ if(exception != 'abort') {
+ alert("An error occurred while communicating with the server:\n\n\nreason=" + reason + "\n\nexception=" + exception);
+ }
location.reload(true);
},
});
Modified: ofbiz/branches/release12.04/framework/images/webapp/images/selectall.js
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/images/webapp/images/selectall.js?rev=1338109&r1=1338108&r2=1338109&view=diff
==============================================================================
--- ofbiz/branches/release12.04/framework/images/webapp/images/selectall.js (original)
+++ ofbiz/branches/release12.04/framework/images/webapp/images/selectall.js Mon May 14 09:20:21 2012
@@ -444,7 +444,6 @@ function ajaxAutoCompleter(areaCsvString
}
},
error: function(xhr, reason, exception) {
- //TODO ... need to localize the following error message.
if(exception != 'abort') {
alert("An error occurred while communicating with the server:\n\n\nreason=" + reason + "\n\nexception=" + exception);
}