adding a "None" to resource selection in calendar, to allow to remove all resources from view

This commit is contained in:
Ralf Becker 2015-10-08 19:57:29 +00:00
parent 51b60c5df6
commit 7b0ba9fb95

View File

@ -509,7 +509,7 @@ class resources_ui
// Set original size picture // Set original size picture
$content['picture_original'] = $content['picture_src'] == 'own_src'? $content['picture_original'] = $content['picture_src'] == 'own_src'?
'webdav.php/apps/resources/'.$content['res_id'].'/.picture.jpg': $this->bo->get_picture($content['res_id'],true); 'webdav.php/apps/resources/'.$content['res_id'].'/.picture.jpg': $this->bo->get_picture($content['res_id'],true);
$content['quantity'] = $content['quantity'] ? $content['quantity'] : 1; $content['quantity'] = $content['quantity'] ? $content['quantity'] : 1;
$content['useable'] = $content['useable'] ? $content['useable'] : 1; $content['useable'] = $content['useable'] ? $content['useable'] : 1;
$content['accessory_of'] = $content['accessory_of'] ? $content['accessory_of'] : $accessory_of; $content['accessory_of'] = $content['accessory_of'] ? $content['accessory_of'] : $accessory_of;
@ -647,10 +647,10 @@ class resources_ui
$selectbox = html::select( $selectbox = html::select(
'owner', 'owner',
$selected, $selected,
array_merge($resources,$res_cats), $options=array_merge(array('r0' => lang('None')),$resources,$res_cats),
$no_lang=true, true, // no lang
$options=' style="width: 100%;" id="uical_select_resource"', ' style="width: 100%;" id="uical_select_resource"',
$multiple=4, min(4, count($options)), // multiple
false false
); );
return array( return array(