extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-10-05 17:52:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

show_rows -> work also with ui::select

Browse Source
This commit is contained in:
Cornelius Weiß 2005-06-11 15:19:47 +00:00
parent 9e7576880d
commit 6ccbfc8439
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
resources/inc/class.bo_resources.inc.php
View File

@ -40,7 +40,6 @@ class bo_resources
function get_rows($query,&$rows,&$readonlys)
{
$query['search'] = $query['search'] ? $query['search'] : '*';
$criteria = array('name' => $query['search'], 'short_description' => $query['search']);
$read_onlys = 'id,name,short_description,quantity,useable,bookable,buyable,cat_id,location';
@ -48,6 +47,7 @@ class bo_resources
$filter = array('accessory_of' => $accessory_of);
$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);
$order_by = $query['order'] ? $query['order'].' '. $query['sort'] : '';
$start = (int)$query['start'];
@ -55,6 +55,9 @@ class bo_resources
$rows = $this->so->search($criteria,$read_onlys,$order_by,'','',$empty=False,$op='OR',$start,$filter,$join='',$need_full_no_count=false);
$nr = $this->so->total;
// We don't need the readonly checkes if we only show bookable resources
if($query['show_bookable']) return $nr;
foreach((array)$rows as $num => $resource)
{
if (!$this->acl->is_permitted($resource['cat_id'],EGW_ACL_EDIT))
@ -92,7 +95,6 @@ class bo_resources
}
}
}
print_r($content);
$rows[$num]['picture_thumb'] = $this->get_picture($resource['id']);
$rows[$num]['admin'] = $this->acl->get_cat_admin($resource['cat_id']);
}