mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-03 21:27:25 +02:00
Code Issues Releases Wiki Activity

Admin UI - 'group by' statement auto-added now

Browse Source
This commit is contained in:
secretr
2010-11-16 10:13:44 +00:00
parent adf5a7aba5
commit 81212c5b4e
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
e107_handlers/admin_ui.php
View File

@@ -2938,6 +2938,14 @@ class e_admin_controller_ui extends e_admin_controller
{ {
$qry = $listQry ? $listQry : "SELECT SQL_CALC_FOUND_ROWS ".$tableSFields." FROM ".$tableFrom; $qry = $listQry ? $listQry : "SELECT SQL_CALC_FOUND_ROWS ".$tableSFields." FROM ".$tableFrom;
} }
// group field - currently auto-added only if there are joins
// TODO - groupField property
$groupField = '';
if($joins && $this->getPrimaryName())
{
$groupField = $tablePath.$this->getPrimaryName();
}
if($raw) if($raw)
{ {
@@ -2945,6 +2953,7 @@ class e_admin_controller_ui extends e_admin_controller
$rawData['tableFrom'] = $tableSFieldsArr; $rawData['tableFrom'] = $tableSFieldsArr;
$rawData['joinsFrom'] = $tableSJoinArr; $rawData['joinsFrom'] = $tableSJoinArr;
$rawData['joins'] = $joins; $rawData['joins'] = $joins;
$rawData['groupField'] = $groupField;
$rawData['orderField'] = isset($this->fields[$orderField]) ? $this->fields[$orderField]['__tableField'] : ''; $rawData['orderField'] = isset($this->fields[$orderField]) ? $this->fields[$orderField]['__tableField'] : '';
$rawData['orderType'] = $request->getQuery('asc') == 'desc' ? 'DESC' : 'ASC'; $rawData['orderType'] = $request->getQuery('asc') == 'desc' ? 'DESC' : 'ASC';
$rawData['limitFrom'] = false === $forceFrom ? intval($request->getQuery('from', 0)) : intval($forceFrom); $rawData['limitFrom'] = false === $forceFrom ? intval($request->getQuery('from', 0)) : intval($forceFrom);
@@ -2968,6 +2977,12 @@ class e_admin_controller_ui extends e_admin_controller
{ {
$qry .= " WHERE ".implode(" AND ", $searchQry); $qry .= " WHERE ".implode(" AND ", $searchQry);
} }
// GROUP BY if needed
if($groupField)
{
$qry .= ' GROUP BY '.$groupField;
}
// only when no custom order is required // only when no custom order is required
if($this->listOrder && !$request->getQuery('field') && !$request->getQuery('asc')) if($this->listOrder && !$request->getQuery('field') && !$request->getQuery('asc'))