Author: nathangray
New Revision: 35449
URL: http://svn.stylite.de/viewvc/egroupware?rev=35449&view=rev
Log:
Fix filter for personal categories under a global category
Modified:
trunk/admin/inc/class.admin_categories.inc.php
trunk/preferences/inc/class.preferences_categories_ui.inc.php
Modified: trunk/admin/inc/class.admin_categories.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/admin/inc/class.admin_categories.inc.php?rev=35449&r1=35448&r2=35449&view=diff
— trunk/admin/inc/class.admin_categories.inc.php (original)
+++ trunk/admin/inc/class.admin_categories.inc.php Wed Jun 22 22:45:42 2011
@@ -285,7 +285,7 @@
* @param array &$readonlys eg. to disable buttons based on acl, not use here, maybe in a derived class
* @return int total number of rows
*/
- static function get_rows($query,&$rows,&$readonlys)
- public function get_rows($query,&$rows,&$readonlys)
{
self::init_static();
@@ -310,15 +310,21 @@
$filter[‘owner’] = 0;
}
-
//$cats = new categories($query['col_filter']['owner'] ? $query['col_filter']['owner'] : $query['filter'],$query['appname']); $cats = new categories($filter['owner'],$query['appname']); -
$parent =array(0); -
// Use all parents, in case user has their cat as a child of a global or something -
//if($filter['owner']) $parent += $cats->return_array('all',0,false,'','ASC','',true,null,-1, 'id'); -
$rows = $cats->return_sorted_array($query['start'],$query['num_rows'],$query['search'],$query['sort'],$query['order'],$globalcat,$parent,true, $filter); -
foreach($rows as &$row) -
{
+$globalcat=1;
+$parent = 0;
-
$rows = $cats->return_sorted_array($query['start'],false,$query['search'],$query['sort'],$query['order'],$globalcat,$parent,true); -
$count = $cats->total_records; -
foreach($rows as $key => &$row) -
{ -
if($filter['owner'] && $filter['owner'] != $row['owner']) -
{ -
unset($rows[$key]); -
$count--; -
continue; -
} -
$row['level_spacer'] = str_repeat(' ',$row['level']); if ($row['data']['icon']) $row['icon_url'] = self::icon_url($row['data']['icon']);
@@ -334,13 +340,14 @@
$readonlys[“add[$row[id]]”] = !self::$acl_add_sub;
$readonlys[“delete[$row[id]]”] = !self::$acl_delete;
}
-
$rows = $count <= $query['num_rows'] ? array_values($rows) : array_slice($rows, $query['start'], $query['num_rows']); // make appname available for actions $rows['appname'] = $query['appname'];
-
$GLOBALS['egw_info']['flags']['app_header'] = lang('Admin').' - '.lang('Global categories').
-
$GLOBALS['egw_info']['flags']['app_header'] = lang($this->appname).' - '.lang('categories'). ($query['appname'] != categories::GLOBAL_APPNAME ? ': '.lang($query['appname']) : '');
-
return $cats->total_records;
-
return $count;}
/**
Modified: trunk/preferences/inc/class.preferences_categories_ui.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/preferences/inc/class.preferences_categories_ui.inc.php?rev=35449&r1=35448&r2=35449&view=diff
— trunk/preferences/inc/class.preferences_categories_ui.inc.php (original)
+++ trunk/preferences/inc/class.preferences_categories_ui.inc.php Wed Jun 22 22:45:42 2011
@@ -17,7 +17,7 @@
class preferences_categories_ui extends admin_categories {
protected $appname = 'preferences';
- protected $get_rows = ‘preferences_categories_ui::get_rows’;
- protected $get_rows = ‘preferencespreferences_categories_ui.get_rows’;
protected $list_link = ‘preferences.preferences_categories_ui.index’;
protected $edit_link = ‘preferences.preferences_categories_ui.edit’;
protected $add_link = ‘preferences.preferences_categories_ui.edit’;
@@ -25,7 +25,7 @@
function __construct() {
}
- public static function get_rows(&$query, &$rows, &$readonlys) {
- public function get_rows(&$query, &$rows, &$readonlys) {
$count = parent::get_rows($query, $rows, $readonlys);
$rows[‘edit_link’] = ‘preferences.preferences_categories_ui.edit’;
return $count;
Simplify data backup and recovery for your virtual environment with vRanger.
Installation’s a snap, and flexible recovery options mean your data is safe,
secure and there when you need it. Data protection magic?
Nope - It’s vRanger. Get your free trial download today.
http://p.sf.net/sfu/quest-sfdev2dev
eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs