From 3065be1b71e4c40428cfa192de560c970ba7f8b3 Mon Sep 17 00:00:00 2001
From: Giulio Cesare Solaroli <giulio.cesare@clipperz.com>
Date: Tue, 04 Oct 2011 23:24:50 +0000
Subject: Merge branch 'timeout'

---
(limited to 'frontend')

diff --git a/frontend/beta/js/Clipperz/PM/Proxy/Proxy.PHP.js b/frontend/beta/js/Clipperz/PM/Proxy/Proxy.PHP.js
index e7c2bc1..6185fd6 100755
--- a/frontend/beta/js/Clipperz/PM/Proxy/Proxy.PHP.js
+++ b/frontend/beta/js/Clipperz/PM/Proxy/Proxy.PHP.js
@@ -238,6 +238,12 @@ YAHOO.extendX(Clipperz.PM.Proxy.PHP, Clipperz.PM.Proxy, {
 //deferredResult.addCallback(function(res) {MochiKit.Logging.logDebug("Proxy.PHP.response - 2: " + res.responseText); return res;});
 //deferredResult.addErrback(function(res) {MochiKit.Logging.logDebug("Proxy.PHP.response - ERROR: " + res); return res;});
 		deferredResult.addCallback(MochiKit.Async.evalJSONRequest);
+		deferredResult.addCallback(function (someValues) {
+			if (someValues['result'] == 'EXCEPTION') {
+				throw someValues['message'];
+			}
+			return someValues;
+		})
 		deferredResult.callback();
 
 		return deferredResult;
--
cgit v0.9.0.2