#878: Missing sscrollbar in "linkset-direct" edition popup dialog

#881: Paginated list in popup dialog is broken
- Missing scrollbar in the popup when using the [+] button

SVN:trunk[3121]
This commit is contained in:
Denis Flaven
2014-04-01 13:09:02 +00:00
parent b43884a760
commit 8f25fb8e64
3 changed files with 8 additions and 3 deletions

View File

@@ -57,6 +57,7 @@ try
case 'pagination':
$oPage->SetContentType('text/html');
$extraParams = utils::ReadParam('extra_param', '', false, 'raw_data');
$aExtraParams = array();
if (is_array($extraParams))
{
$aExtraParams = $extraParams;
@@ -64,10 +65,13 @@ try
else
{
$sExtraParams = stripslashes($extraParams);
$aExtraParams = array();
if (!empty($sExtraParams))
{
$aExtraParams = json_decode(str_replace("'", '"', $sExtraParams), true /* associative array */);
$val = json_decode(str_replace("'", '"', $sExtraParams), true /* associative array */);
if ($val !== null)
{
$aExtraParams = $val;
}
}
}
if ($sEncoding == 'oql')