extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-07 16:44:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Resources - add (usable / quantity) for bookable resources in calendar participants results

Browse Source
This commit is contained in:
nathangray 2018-08-07 13:00:35 -06:00
parent 3604e66fa6
commit 92df7d3376
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
resources/inc/class.resources_bo.inc.php
View File

@ -698,7 +698,7 @@ class resources_bo
$criteria = array('name' => $pattern
, 'short_description' => $pattern);
}
$only_keys = 'res_id,name,short_description,bookable,useable';
$only_keys = 'res_id,name,short_description,bookable,useable,quantity';
// If no read access to any category, just stop
if(!$this->acl->get_cats(Acl::READ))
@ -810,11 +810,15 @@ class resources_bo
//maybe this resource is reserved
if ( ($resource['useable'] < 1) )
{
if($show_conflict) {
if($show_conflict)
{
$list[$id] = ' ('.lang('conflict').') '.$resource['name']. ($resource['short_description'] ? ', ['.$resource['short_description'].']':'');
}
} else {
$list[$id] = $resource['name']. ($resource['short_description'] ? ', ['.$resource['short_description'].']':'');
}
else
{
$list[$id] = $resource['name']. ($resource['short_description'] ? ', ['.$resource['short_description'].']':'') .
($resource['useable'] > 1 ? "( {$resource['useable']} / {$resource['quantity']} )" : '');
}
}
} else {