summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--HISTORY1
-rw-r--r--framework/Web/Javascripts/source/prado/activecontrols/ajax3.js5
2 files changed, 5 insertions, 1 deletions
diff --git a/HISTORY b/HISTORY
index 76880785..b7166184 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,6 +1,7 @@
Version 3.1.2 To be released
============================
BUG: Ticket#719 - TAutoCompleter should not trigger Validation if CausesValidation=False (Christophe)
+BUG: Ticket#744 - Callback error handling is improved (Qiang)
BUG: Ticket#750 - The "expire" parameter is used inconsistently in cache modules (Qiang)
BUG: Fixed a bug in TPropertyValue::ensureArray() (Qiang)
CHG: Changed TConditional so that the controls in its template behave like they are in its parent (Qiang)
diff --git a/framework/Web/Javascripts/source/prado/activecontrols/ajax3.js b/framework/Web/Javascripts/source/prado/activecontrols/ajax3.js
index e7c7e20f..6fd71948 100644
--- a/framework/Web/Javascripts/source/prado/activecontrols/ajax3.js
+++ b/framework/Web/Javascripts/source/prado/activecontrols/ajax3.js
@@ -230,7 +230,10 @@ Object.extend(Prado.CallbackRequest,
"on500" : function(request, transport, data)
{
var e = request.getHeaderData(Prado.CallbackRequest.ERROR_HEADER);
- Logger.error("Callback Server Error "+e.code, this.formatException(e));
+ if (e)
+ Logger.error("Callback Server Error "+e.code, this.formatException(e));
+ else
+ Logger.error("Callback Server Error Unknown",'');
},
/**