mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-25 17:01:43 +02:00
Code Issues Releases Wiki Activity

Fixes #853 - Admin-UI custom queries

Browse Source
This commit is contained in:
Cameron
2015-02-02 11:59:17 -08:00
parent bf4649e171
commit 7cf55a9d9c
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_admin/image.php
View File

@@ -591,7 +591,7 @@ class media_form_ui extends e_admin_form_ui
} }
function media_preview($curVal, $mode, $attributes, $id='') function media_preview($curVal, $mode, $attributes, $id=null)
{ {
$attributes['type'] = 'image'; $attributes['type'] = 'image';

23
e107_handlers/admin_ui.php
View File

@@ -3550,15 +3550,20 @@ class e_admin_controller_ui extends e_admin_controller
*/ */
protected function parseCustomListQry($qry) protected function parseCustomListQry($qry)
{ {
if(strpos($qry,'`')===false) e107::getMessage()->addDebug('Using Custom listQry ');
if(strpos($qry,'`')===false && strpos($qry, 'JOIN')===false)
{ {
$ret = preg_replace("/FROM\s*(#[\w]*/","FROM `$1`", $qry); // backticks missing, so add them. $ret = preg_replace("/FROM\s*(#[\w]*)/","FROM `$1`", $qry); // backticks missing, so add them.
e107::getMessage()->addDebug('Your $listQry is missing `backticks` around the table name!');
return $ret; if($ret)
{
e107::getMessage()->addDebug('Your $listQry is missing `backticks` around the table name! It should look like this'. print_a($ret,true));
return $ret;
}
} }
return $qry; return $qry;
} }
@@ -3759,7 +3764,8 @@ class e_admin_controller_ui extends e_admin_controller
} }
else else
{ {
$qry = $this->parseCustomListQry($listQry) ? $listQry : "SELECT SQL_CALC_FOUND_ROWS ".$tableSFields." FROM ".$tableFrom;
$qry = $listQry ? $this->parseCustomListQry($listQry) : "SELECT SQL_CALC_FOUND_ROWS ".$tableSFields." FROM ".$tableFrom;
} }
// group field - currently auto-added only if there are joins // group field - currently auto-added only if there are joins
@@ -3861,10 +3867,7 @@ class e_admin_controller_ui extends e_admin_controller
} }
// Debug Filter Query. // Debug Filter Query.
if($listQry)
{
e107::getMessage()->addDebug('Using Custom listQry ');
}
e107::getMessage()->addDebug('QRY='.str_replace('#', MPREFIX, $qry)); e107::getMessage()->addDebug('QRY='.str_replace('#', MPREFIX, $qry));
// echo $qry.'<br />'; // echo $qry.'<br />';