mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-05 06:07:32 +02:00
Code Issues Releases Wiki Activity

Admin UI - filter improvements, minor bugfixes

Browse Source
This commit is contained in:
secretr
2012-01-16 12:51:53 +00:00
parent 9bf84739e6
commit 65ed144ed7
1 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
e107_handlers/admin_ui.php
View File

@@ -2080,6 +2080,12 @@ class e_admin_controller_ui extends e_admin_controller
*/ */
protected $_pref = null; protected $_pref = null;
/**
* Prevent parsing table aliases more than once
* @var boolean
*/
protected $_alias_parsed = false;
public function getBatchDelete() public function getBatchDelete()
{ {
return $this->batchDelete; return $this->batchDelete;
@@ -2607,7 +2613,13 @@ class e_admin_controller_ui extends e_admin_controller
$method = 'handle'.$this->getRequest()->getActionName().$this->getRequest()->camelize($filter[0]).'Filter'; $method = 'handle'.$this->getRequest()->getActionName().$this->getRequest()->camelize($filter[0]).'Filter';
if(method_exists($this, $method)) // callback handling if(method_exists($this, $method)) // callback handling
{ {
return $this->$method($filter[1], $selected); //return $this->$method($filter[1], $selected); selected?
// better approach - pass all values as method arguments
// NOTE - callbacks are allowed to return QUERY as a string, it'll be added in the WHERE clause
$args = array_slice($filter, 1);
e107::getMessage()->addDebug('Executing filter callback <strong>'.get_class($this).'::'.$method.'('.implode(', ', $args).')</strong>');
return call_user_func_array(array($this, $method), $args);
} }
else // default handling else // default handling
{ {
@@ -2920,13 +2932,21 @@ class e_admin_controller_ui extends e_admin_controller
$searchQuery = $tp->toDB($request->getQuery('searchquery', '')); $searchQuery = $tp->toDB($request->getQuery('searchquery', ''));
$searchFilter = $this->_parseFilterRequest($request->getQuery('filter_options', '')); $searchFilter = $this->_parseFilterRequest($request->getQuery('filter_options', ''));
if($searchFilter && is_array($searchFilter))
{
list($filterField, $filterValue) = $searchFilter; list($filterField, $filterValue) = $searchFilter;
if($filterField && $filterValue !== '' && isset($this->fields[$filterField])) if($filterField && $filterValue !== '' && isset($this->fields[$filterField]))
{ {
$searchQry[] = $this->fields[$filterField]['__tableField']." = '".$filterValue."'"; $searchQry[] = $this->fields[$filterField]['__tableField']." = '".$tp->toDB($filterValue)."'";
}
}
elseif($searchFilter && is_string($searchFilter))
{
// filter callbacks could add to WHERE clause
$searchQry[] = $searchFilter;
} }
// main table should select everything // main table should select everything
$tableSFieldsArr[] = $tablePath.'*'; $tableSFieldsArr[] = $tablePath.'*';
@@ -3340,7 +3360,7 @@ class e_admin_ui extends e_admin_controller_ui
} }
// delete one by one - more control, less performance // delete one by one - more control, less performance
// TODO - pass afterDelete() callback to tree delete method? // pass afterDelete() callback to tree delete method
$set_messages = true; $set_messages = true;
foreach ($selected as $id) foreach ($selected as $id)
{ {