mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-01 20:30:39 +02:00
Code Issues Releases Wiki Activity

Added filter by template to News admin area list.

Browse Source
This commit is contained in:
Cameron
2016-04-20 18:08:52 -07:00
parent 42191db509
commit f6026fe1ec
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
e107_handlers/admin_ui.php
View File

@@ -3693,6 +3693,7 @@ class e_admin_controller_ui extends e_admin_controller
$tableSJoinArr = array(); // FROM for join tables $tableSJoinArr = array(); // FROM for join tables
$filter = array(); $filter = array();
$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', ''));
@@ -3703,7 +3704,7 @@ class e_admin_controller_ui extends e_admin_controller
if($searchFilter && is_array($searchFilter)) 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]))
@@ -3711,7 +3712,7 @@ class e_admin_controller_ui extends e_admin_controller
$_dataType = $this->fields[$filterField]['data']; $_dataType = $this->fields[$filterField]['data'];
$_fieldType = $this->fields[$filterField]['type']; $_fieldType = $this->fields[$filterField]['type'];
if($_fieldType === 'comma' || $_fieldType === 'checkboxes' || $_fieldType == 'userclasses') if($_fieldType === 'comma' || $_fieldType === 'checkboxes' || $_fieldType == 'userclasses' || ($_fieldType == 'dropdown' && !empty($this->fields[$filterField]['writeParms']['multiple'])))
{ {
$_dataType = 'set'; $_dataType = 'set';
} }
@@ -6328,6 +6329,9 @@ class e_admin_form_ui extends e_form
case 'dropdown': // use the array $parm; case 'dropdown': // use the array $parm;
if(!empty($parms['optArray'])) if(!empty($parms['optArray']))
{ {
$fopts = $parms; $fopts = $parms;
@@ -6339,12 +6343,16 @@ class e_admin_form_ui extends e_form
if(!is_array(varset($parms['__options']))) parse_str($parms['__options'], $parms['__options']); if(!is_array(varset($parms['__options']))) parse_str($parms['__options'], $parms['__options']);
$opts = $parms['__options']; $opts = $parms['__options'];
if(vartrue($opts['multiple'])) if(vartrue($opts['multiple']) && $type == 'batch')
{ {
// no batch support for multiple, should have some for filters soon // no batch support for multiple, should have some for filters soon
continue; continue;
} }
unset($parms['__options']); //remove element options if any unset($parms['__options']); //remove element options if any
foreach($parms as $k => $name) foreach($parms as $k => $name)
{ {
$option[$key.'__'.$k] = $name; $option[$key.'__'.$k] = $name;

2
e107_plugins/poll/poll_class.php
View File

@@ -57,7 +57,7 @@ class poll
} }
} }
} }
if (count($arr_polls_cookies) > 1) if (count($arr_polls_cookies) > 1)
{ // Remove all except first (assumption: there is always only one active poll) { // Remove all except first (assumption: there is always only one active poll)
rsort($arr_polls_cookies); rsort($arr_polls_cookies);