r28277 - /trunk/resources/inc/class.bo_resources.inc.php

[ralfbecker]

Author: ralfbecker
Date: Fri Nov  6 19:47:31 2009
New Revision: 28277

URL: http://www.egroupware.org/viewvc/egroupware?rev=28277&view=rev
Log:
"fixed missing categories in \"all categories\" filter, if (sub-)categories have same names"

Modified:
    trunk/resources/inc/class.bo_resources.inc.php

Modified: trunk/resources/inc/class.bo_resources.inc.php
URL: http://www.egroupware.org/viewvc/egroupware/trunk/resources/inc/class.bo_resources.inc.php?rev=28277&r1=28276&r2=28277&view=diff
==============================================================================
--- trunk/resources/inc/class.bo_resources.inc.php (original)
+++ trunk/resources/inc/class.bo_resources.inc.php Fri Nov  6 19:47:31 2009
@@ -86,12 +86,14 @@
  $filter['cat_id'] = $query['filter'];
  }
  }
- else
- {
- $readcats = array_flip((array)$this->acl->get_cats(EGW_ACL_READ));
- if($readcats) $filter = $filter + array('cat_id' => $readcats);
- }
- if($query['show_bookable']) $filter = $filter + array('bookable' => true);
+ elseif (($readcats = $this->acl->get_cats(EGW_ACL_READ)))
+ {
+ $filter['cat_id'] = array_keys($readcats);
+ }
+ if ($query['show_bookable'])
+ {
+ $filter['bookable'] = true;
+ }
  $order_by = $query['order'] ? $query['order'].' '. $query['sort'] : '';
  $start = (int)$query['start'];
 


------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now.  http://p.sf.net/sfu/bobj-july
_______________________________________________
eGroupWare-cvs mailing list
eGroupWare-cvs@...
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs