extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-29 19:33:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added exception and error messages to egw_json

Browse Source
This commit is contained in:
Andreas Stöckel 2010-06-21 08:39:21 +00:00
parent 729c7cb362
commit 01826c38b2
2 changed files with 156 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
phpgwapi/inc/class.egw_json.inc.php
View File

@ -332,6 +332,17 @@ class egw_json_response
} }
} }
/**
* Displays an error message on the client
*/
public function error($msg)
{
if (is_string($msg))
{
$this->addGeneric('error', $msg);
}
}
/** /**
* Includes the given CSS file. Every url can only be included once. * Includes the given CSS file. Every url can only be included once.
* *

48
phpgwapi/js/egw_json.js
View File

@ -204,14 +204,24 @@ egw_json_request.prototype.alertFunc = function(_message, _details)
alert(_message); alert(_message);
} }
function _egw_json_debug_log(_msg) function _egw_json_debug_log(_msg, _e)
{ {
if (typeof console != "undefined" && typeof console.log != "undefined") if (typeof console != "undefined" && typeof console.log != "undefined")
{ {
console.log(_msg); console.log(_msg, _e);
} }
} }
/* Displays an json error message */
egw_json_request.prototype.jsonError = function(_msg, _e)
{
var msg = 'EGW JSON Error: '._msg;
//Log and show the error message
_egw_json_bebug_log(msg, _e);
this.alertHandler(msg);
}
/* Internal function which handles the response from the server */ /* Internal function which handles the response from the server */
egw_json_request.prototype.handleResponse = function(data, textStatus, XMLHttpRequest) egw_json_request.prototype.handleResponse = function(data, textStatus, XMLHttpRequest)
{ {
@ -219,6 +229,8 @@ egw_json_request.prototype.handleResponse = function(data, textStatus, XMLHttpRe
{ {
var hasResponse = false; var hasResponse = false;
for (var i = 0; i < data.response.length; i++) for (var i = 0; i < data.response.length; i++)
{
try
{ {
var res = data.response[i]; var res = data.response[i];
@ -233,7 +245,8 @@ egw_json_request.prototype.handleResponse = function(data, textStatus, XMLHttpRe
res.data.message, res.data.message,
res.data.details) res.data.details)
hasResponse = true; hasResponse = true;
} } else
throw 'Invalid parameters';
break; break;
case 'assign': case 'assign':
//Check whether all needed parameters have been passed and call the alertHandler function //Check whether all needed parameters have been passed and call the alertHandler function
@ -247,7 +260,8 @@ egw_json_request.prototype.handleResponse = function(data, textStatus, XMLHttpRe
obj[res.data.key] = res.data.value; obj[res.data.key] = res.data.value;
hasResponse = true; hasResponse = true;
} }
} } else
throw 'Invalid parameters';
break; break;
case 'data': case 'data':
//Callback the caller in order to allow him to handle the data //Callback the caller in order to allow him to handle the data
@ -271,7 +285,8 @@ egw_json_request.prototype.handleResponse = function(data, textStatus, XMLHttpRe
_egw_json_debug_log(e); _egw_json_debug_log(e);
} }
hasResponse = true; hasResponse = true;
} } else
throw 'Invalid parameters';
break; break;
case 'jquery': case 'jquery':
if (typeof res.data.select == 'string' && if (typeof res.data.select == 'string' &&
@ -287,7 +302,8 @@ egw_json_request.prototype.handleResponse = function(data, textStatus, XMLHttpRe
_egw_json_debug_log(e); _egw_json_debug_log(e);
} }
hasResponse = true; hasResponse = true;
} } else
throw 'Invalid parameters';
break; break;
case 'redirect': case 'redirect':
if (typeof res.data.url == 'string' && if (typeof res.data.url == 'string' &&
@ -307,7 +323,8 @@ egw_json_request.prototype.handleResponse = function(data, textStatus, XMLHttpRe
} }
hasResponse = true; hasResponse = true;
} } else
throw 'Invalid parameters';
break; break;
case 'css': case 'css':
if (typeof res.data == 'string') if (typeof res.data == 'string')
@ -326,7 +343,8 @@ egw_json_request.prototype.handleResponse = function(data, textStatus, XMLHttpRe
headID.appendChild(cssnode); headID.appendChild(cssnode);
} }
hasResponse = true; hasResponse = true;
} } else
throw 'Invalid parameters';
break; break;
case 'js': case 'js':
if (typeof res.data == 'string') if (typeof res.data == 'string')
@ -344,8 +362,20 @@ egw_json_request.prototype.handleResponse = function(data, textStatus, XMLHttpRe
headID.appendChild(scriptnode); headID.appendChild(scriptnode);
} }
hasResponse = true; hasResponse = true;
} } else
throw 'Invalid parameters';
break; break;
case 'error':
if (typeof res.data == 'string')
{
this.jsonError(res.data);
hasResponse = true;
} else
throw 'Invalid parameters';
break;
}
} catch(e) {
this.jsonError('Internal JSON handler error', e);
} }
} }