FSN#39251 self als filterwaarde

svn path=/Website/trunk/; revision=32598
This commit is contained in:
Jos Groot Lipman
2017-01-30 08:45:52 +00:00
parent a94e0c1ac4
commit 66cae18ce4
2 changed files with 11 additions and 3 deletions

View File

@@ -225,7 +225,10 @@ api2 = {
}
else
{
var safe_val = parseInt(filterval, 10);
if (String(filterval).toLowerCase() == "self")
var safe_val = user_key;
else
var safe_val = parseInt(filterval, 10);
if (isNaN(safe_val))
{
return ["0=1"];

View File

@@ -215,7 +215,12 @@ var shared = {
_qssafe: function __qssafe(model, fld, strval)
{
if (fld.toLowerCase() == 'id')
return parseInt(strval, 10);
{
if (String(strval).toLowerCase() == "self")
return user_key;
else
return parseInt(strval, 10);
}
return strval; // NOTE: Rest nog even niet, gaf nog problemen met foreigns (FSN#33730)
@@ -368,7 +373,7 @@ function _get_ParamInt(pColl, pName, defVal, relaxed)
{
var strval = _get_Param(pColl, pName, defVal, true); // force: een lege waarde wordt als afwezig beschouwd
if (strval == "") return defVal;
if (strval == "SELF") return user_key;
if (String(strval).toLowerCase() == "self") return user_key;
if (strval == defVal) return defVal;
if (relaxed)
strval = String(strval).replace(/[^0-9]*/, ''); // strip leading non-digits