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

e_model_interface - search/filter now retains settings.

Browse Source
This commit is contained in:
CaMer0n
2009-10-26 08:12:59 +00:00
parent 6c459ee271
commit 11ea9dc29f
1 changed files with 31 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
e107_handlers/model_class.php
View File

@@ -9,8 +9,8 @@
* e107 Base Model * e107 Base Model
* *
* $Source: /cvs_backup/e107_0.8/e107_handlers/model_class.php,v $ * $Source: /cvs_backup/e107_0.8/e107_handlers/model_class.php,v $
* $Revision: 1.23 $ * $Revision: 1.24 $
* $Date: 2009-10-26 07:44:30 $ * $Date: 2009-10-26 08:12:59 $
* $Author: e107coders $ * $Author: e107coders $
*/ */
@@ -1690,6 +1690,7 @@ class e_model_interface
{ {
if(vartrue($_POST['multiselect'])) if(vartrue($_POST['multiselect']))
{ {
// $_SESSION[$this->table."_batch"] = $_POST['execute_batch']; // DO we want this to 'stick'?
list($tmp,$field,$value) = explode('__',$_POST['execute_batch']); list($tmp,$field,$value) = explode('__',$_POST['execute_batch']);
$this->processBatch($field,$_POST['multiselect'],$value); $this->processBatch($field,$_POST['multiselect'],$value);
} }
@@ -1698,6 +1699,7 @@ class e_model_interface
if(varset($_POST['execute_filter'])) // Filter the db records. if(varset($_POST['execute_filter'])) // Filter the db records.
{ {
$_SESSION[$this->table."_filter"] = $_POST['filter_options'];
list($tmp,$filterField,$filterValue) = explode('__',$_POST['filter_options']); list($tmp,$filterField,$filterValue) = explode('__',$_POST['filter_options']);
$this->modifyListQry($_POST['searchquery'],$filterField,$filterValue); $this->modifyListQry($_POST['searchquery'],$filterField,$filterValue);
$this->mode = 'list'; $this->mode = 'list';
@@ -1836,20 +1838,20 @@ class e_model_interface
{ {
continue; continue;
} }
$text .= "\t".$frm->optgroup_open($optdiz[$type].$val['title'], $disabled)."\n";
if(!is_array($val[$type])) $option = array();
{
switch($val['type']) switch($val['type'])
{ {
case 'boolean': //TODO modify description based on $val['parm] case 'boolean': //TODO modify description based on $val['parm]
$text .= $frm->option(LAN_YES, $type.'__'.$key."__1"); $option[$type.'__'.$key."__1"] = LAN_YES;
$text .= $frm->option(LAN_NO, $type.'__'.$key."__0"); $option[$type.'__'.$key."__0"] = LAN_NO;
break; break;
case 'dropdown': // use the array $parm; case 'dropdown': // use the array $parm;
foreach($val['parm'] as $k=>$name) foreach($val['parm'] as $k=>$name)
{ {
$text .= $frm->option($name, $type.'__'.$key."__".$k); $option[$type.'__'.$key."__".$k] = $name;
} }
break; break;
@@ -1865,7 +1867,7 @@ class e_model_interface
$classes = e107::getUserClass()->uc_required_class_list($val['parm']); $classes = e107::getUserClass()->uc_required_class_list($val['parm']);
foreach($classes as $k=>$name) foreach($classes as $k=>$name)
{ {
$text .= $frm->option($name, $type. '__'.$key."__".$k); $option[$type. '__'.$key."__".$k] = $name;
} }
break; break;
@@ -1874,15 +1876,29 @@ class e_model_interface
$list = $this->$method('',$type); $list = $this->$method('',$type);
foreach($list as $k=>$name) foreach($list as $k=>$name)
{ {
$text .= $frm->option($name, $type.'__'.$key."__".$k); $option[$type.'__'.$key."__".$k] = $name;
} }
break; break;
} }
if(count($option)>0)
{
$text .= "\t".$frm->optgroup_open($optdiz[$type].$val['title'], $disabled)."\n";
foreach($option as $okey=>$oval)
{
$sel = ($_SESSION[$this->table."_".$type] == $okey) ? TRUE : FALSE;
$text .= $frm->option($oval, $okey,$sel)."\n";
} }
$text .= $frm->optgroup_close()."\n"; $text .= "\t".$frm->optgroup_close()."\n";
}
} }
$text .= "</select>"; $text .= "</select>";
return $text; return $text;