From ec7d153b8cad0a99f3da61cd9f21c8a3ea6bcd0c Mon Sep 17 00:00:00 2001 From: avl Date: Wed, 1 Apr 2009 11:53:40 +0300 Subject: [PATCH] Tree Filters & remember GET after edit model --- ipf/admin/media/css/changelists.css | 4 +- ipf/admin/model.php | 180 +++++++++++++++++++++----- ipf/admin/templates/admin/change.html | 10 ++ 3 files changed, 157 insertions(+), 37 deletions(-) diff --git a/ipf/admin/media/css/changelists.css b/ipf/admin/media/css/changelists.css index af231e9..701ac1f 100644 --- a/ipf/admin/media/css/changelists.css +++ b/ipf/admin/media/css/changelists.css @@ -6,7 +6,7 @@ .change-list .filtered table { border-right:1px solid #ddd; } .change-list .filtered { min-height:400px; } .change-list .filtered { background:white url(../img/changelist-bg.gif) top right repeat-y !important; } -.change-list .filtered table, .change-list .filtered .paginator, .filtered #toolbar, .filtered div.xfull { margin-right:160px !important; width:auto !important; } +.change-list .filtered table, .change-list .filtered .paginator, .filtered #toolbar, .filtered div.xfull { margin-right:200px !important; width:auto !important; } .change-list .filtered table tbody th { padding-right:1em; } #changelist .toplinks { border-bottom:1px solid #ccc !important; } #changelist .paginator { color:#666; border-top:1px solid #eee; border-bottom:1px solid #eee; background:white url(../img/nav-bg.gif) 0 180% repeat-x; overflow:hidden; } @@ -24,7 +24,7 @@ #changelist #changelist-search img { vertical-align:middle; } /* FILTER COLUMN */ -#changelist-filter { position:absolute; top:0; right:0; z-index:1000; width:160px; border-left:1px solid #ddd; background:#efefef; margin:0; } +#changelist-filter { position:absolute; top:0; right:0; z-index:1000; width:200px; border-left:1px solid #ddd; background:#efefef; margin:0; } #changelist-filter h2 { font-size:11px; padding:2px 5px; border-bottom:1px solid #ddd; } #changelist-filter h3 { font-size:12px; margin-bottom:0; } #changelist-filter ul { padding-left:0;margin-left:10px; } diff --git a/ipf/admin/model.php b/ipf/admin/model.php index ee776fb..33dce50 100644 --- a/ipf/admin/model.php +++ b/ipf/admin/model.php @@ -1,9 +1,7 @@ local = $local; - $this->foreign = $foreign; +abstract class BaseListFilter{ + function __construct($title, $choices){ $this->choices = $choices; $this->title = $title; } @@ -23,6 +21,113 @@ class ListFilter{ } return false; } + + abstract function FilterQuery($request,$q); +} + +class ListFilter extends BaseListFilter{ + function __construct($local, $foreign, $choices, $title){ + parent::__construct($title, $choices); + $this->local = $local; + $this->foreign = $foreign; + } + + function FilterQuery($request,$q){ + $param_name = 'filter_'.$this->local; + if (isset($request->GET[$param_name])){ + $id = $request->GET[$param_name]; + if ($this->IsChoice($id)){ + $q->where($this->local.'='.$id); + } + } + } +} + +class ListTreeFilter extends BaseListFilter{ + function __construct($name, $title, $model, $fields){ + $this->name = $name; + $choices = array(); + $choices[] = array( + 'id'=>null, + 'param'=>'', + 'name'=>'All', + 'selected'=>false, + ); + $levels = array(); + + $mrels = $model->getTable()->getRelations(); + $this->fields = array(); + foreach($fields as $fname){ + if (array_key_exists($fname, $mrels)){ + $n = count($this->fields); + if ($n==0) + $parent_key = null; + else + $parent_key = $this->fields[$n-1]['local']; + $this->fields[] = array( + 'name'=>$fname, + 'local'=>$mrels[$fname]->getLocal(), + 'parent_key'=>$parent_key, + 'class'=>$mrels[$fname]->getClass(), + 'objects'=>IPF_ORM_Query::create()->from($mrels[$fname]->getClass())->orderby('ord')->execute(), + ); + } + } + $this->_collectTreeRecursive(&$choices); + parent::__construct($title, $choices); + } + + protected function _collectTreeRecursive(&$choices,$level=0,$parent_id=null,$valname=''){ + foreach($this->fields[$level]['objects'] as $o){ + if ($level>0){ + $foreign = $this->fields[$level]['parent_key']; + if ($parent_id!=$o->$foreign) + continue; + } + $name = str_repeat("-", $level).$o->name; + $id = $valname.$o->id; + $choices[] = array( + 'id'=>$id, + 'param'=>'filter_'.$this->name.'='.$id, + 'name'=>$name, + 'selected'=>false, + ); + if ($level<(count($this->fields)-1)){ + $this->_collectTreeRecursive(&$choices,$level+1,$o->id,$valname.$o->id.'.'); + } + } + } + + function SetSelect($request){ + $sel_id = @$request->GET['filter_'.$this->name]; + foreach($this->choices as &$ch){ + $ch['selected']= ($sel_id==$ch['id']); + } + } + + function FilterQuery($request,$q){ + $param_name = 'filter_'.$this->name; + if (isset($request->GET[$param_name])){ + $id = $request->GET[$param_name]; + if ($this->IsChoice($id)){ + $l = split("\.",$id); + $wh = array(); + for($i=0; $ifields); $i++){ + if ($i>=(count($l))) + $wh[] = $this->fields[$i]['local'].' IS NULL'; + else + $wh[] = $this->fields[$i]['local'].'='.$l[$i]; + } + $dql = ''; + foreach($wh as $w){ + if ($dql!='') + $dql .= ' AND '; + $dql .= $w; + } + $q->where($dql); + } + } + } } class IPF_Admin_Model{ @@ -233,7 +338,9 @@ class IPF_Admin_Model{ $this->saveInlines($item); AdminLog::logAction($request, $item, AdminLog::ADDITION); $this->_afterAdd($item); - $url = IPF_HTTP_URL_urlForView('IPF_Admin_Views_ListItems', array($lapp, $lmodel)); + $url = @$request->POST['ipf_referrer']; + if ($url=='') + $url = IPF_HTTP_URL_urlForView('IPF_Admin_Views_ListItems', array($lapp, $lmodel)); return new IPF_HTTP_Response_Redirect($url); } } @@ -270,7 +377,9 @@ class IPF_Admin_Model{ $this->saveInlines($item); AdminLog::logAction($request, $item, AdminLog::CHANGE); $this->_afterEdit($item); - $url = IPF_HTTP_URL_urlForView('IPF_Admin_Views_ListItems', array($lapp, $lmodel)); + $url = @$request->POST['ipf_referrer']; + if ($url=='') + $url = IPF_HTTP_URL_urlForView('IPF_Admin_Views_ListItems', array($lapp, $lmodel)); return new IPF_HTTP_Response_Redirect($url); } } @@ -327,13 +436,7 @@ class IPF_Admin_Model{ protected function _ListFilterQuery($request){ foreach($this->filters as $f){ - $param_name = 'filter_'.$f->local; - if (isset($request->GET[$param_name])){ - $id = $request->GET[$param_name]; - if ($f->IsChoice($id)){ - $this->q->where($f->local.'='.$id); - } - } + $f->FilterQuery($request,$this->q); } } @@ -341,29 +444,36 @@ class IPF_Admin_Model{ $this->filters = array(); $rels = $this->model->getTable()->getRelations(); foreach($this->_listFilters() as $f){ - $local = $rels[$f]['local']; - $foreign = $rels[$f]['foreign']; - $sel_id = @$request->GET['filter_'.$local]; - $choices = array(); - $choices[] = array( - 'id'=>null, - 'param'=>'', - 'name'=>'All', - 'selected'=>($sel_id==''), - ); - foreach (IPF_ORM::getTable($rels[$f]['class'])->findAll() as $val){ - $selected = false; - $id = $val[$foreign]; - if ($sel_id==$id) - $selected = true; - $choices[] = array( - 'id'=>$id, - 'param'=>'filter_'.$local.'='.$id, - 'name'=>(string)$val, - 'selected'=>$selected, - ); + if (is_string($f)){ + $local = $rels[$f]['local']; + $foreign = $rels[$f]['foreign']; + $sel_id = @$request->GET['filter_'.$local]; + $choices = array(); + $choices[] = array( + 'id'=>null, + 'param'=>'', + 'name'=>'All', + 'selected'=>($sel_id==''), + ); + foreach (IPF_ORM::getTable($rels[$f]['class'])->findAll() as $val){ + $selected = false; + $id = $val[$foreign]; + if ($sel_id==$id) + $selected = true; + $choices[] = array( + 'id'=>$id, + 'param'=>'filter_'.$local.'='.$id, + 'name'=>(string)$val, + 'selected'=>$selected, + ); + } + $this->filters[$f] = new ListFilter($local, $foreign, $choices, 'By '.IPF_Utils::humanTitle($f)); + } else { + if (get_class($f)=='ListTreeFilter'){ + $f->SetSelect($request); + $this->filters[$f->name] = $f; + } } - $this->filters[$f] = new ListFilter($local, $foreign, $choices, 'By '.IPF_Utils::humanTitle($f)); } } diff --git a/ipf/admin/templates/admin/change.html b/ipf/admin/templates/admin/change.html index 6011f48..22f5774 100644 --- a/ipf/admin/templates/admin/change.html +++ b/ipf/admin/templates/admin/change.html @@ -5,10 +5,20 @@ {block breadcrumbs}
Home » {$classname} » {$page_title}
{/block} {block content} + + +

{$page_title}

+
{if $form.errors}

Please correct the error below.

-- 2.49.0