From: <sy...@us...> - 2010-01-06 13:44:34
|
Revision: 24161 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=24161&view=rev Author: sylvieg Date: 2010-01-06 13:44:27 +0000 (Wed, 06 Jan 2010) Log Message: ----------- [FIX]trackerstat: fix stat on categ Modified Paths: -------------- trunk/lib/categories/categlib.php trunk/lib/wiki-plugins/wikiplugin_trackerstat.php Modified: trunk/lib/categories/categlib.php =================================================================== --- trunk/lib/categories/categlib.php 2010-01-06 13:31:16 UTC (rev 24160) +++ trunk/lib/categories/categlib.php 2010-01-06 13:44:27 UTC (rev 24161) @@ -559,7 +559,8 @@ } // Get all the objects in a category - function get_category_objects($categId, $type=null) { + // filter = array('table'=>, 'join'=>, 'filter'=>, 'bindvars'=>) + function get_category_objects($categId, $type=null, $filter = null) { $bindVars[] = (int)$categId; if (!empty($type)) { $where = ' and o.`type`=?'; @@ -567,7 +568,14 @@ } else { $where = ''; } - $query = "select * from `tiki_category_objects` c,`tiki_categorized_objects` co, `tiki_objects` o where c.`catObjectId`=co.`catObjectId` and co.`catObjectId`=o.`objectId` and c.`categId`=?".$where; + if (!empty($filter)) { + $from = ',`'.$filter['table'].'` ft'; + $where .= ' and o.`itemId`=ft.`'.$filter['join'].'` and ft.`'.$filter['filter'].'`=?'; + $bindVars[] .= $filter['bindvars']; + } else { + $from = ''; + } + $query = "select * from `tiki_category_objects` c,`tiki_categorized_objects` co, `tiki_objects` o $from where c.`catObjectId`=co.`catObjectId` and co.`catObjectId`=o.`objectId` and c.`categId`=?".$where; $result = $this->query($query, $bindVars); $ret = array(); while ($res = $result->fetchRow()) { Modified: trunk/lib/wiki-plugins/wikiplugin_trackerstat.php =================================================================== --- trunk/lib/wiki-plugins/wikiplugin_trackerstat.php 2010-01-06 13:31:16 UTC (rev 24160) +++ trunk/lib/wiki-plugins/wikiplugin_trackerstat.php 2010-01-06 13:44:27 UTC (rev 24161) @@ -144,7 +144,7 @@ $listCategs = $categlib->get_child_categories($allFields["data"][$i]['options']); $itemId = $trklib->get_user_item($trackerId, $tracker_info); for ($j = 0, $jcount_listcategs = count($listCategs); $j < $jcount_listcategs; ++$j) { - $objects = $categlib->get_category_objects($listCategs[$j]['categId'], "tracker $trackerId"); + $objects = $categlib->get_category_objects($listCategs[$j]['categId'], 'trackeritem', array('table'=>'tiki_tracker_items', 'join'=>'itemId', 'filter'=>'trackerId', 'bindvars'=>$trackerId)); if ($status == 'opc' || $tracker_info['showStatus'] == 'n') { $v[$j]['count'] = count($objects); } else { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |