From 7b0ba9fb9512d24161121adb1cb84e6531c1f53d Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Thu, 8 Oct 2015 19:57:29 +0000 Subject: [PATCH] adding a "None" to resource selection in calendar, to allow to remove all resources from view --- resources/inc/class.resources_ui.inc.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/resources/inc/class.resources_ui.inc.php b/resources/inc/class.resources_ui.inc.php index 07905a1d2e..bf912859c2 100755 --- a/resources/inc/class.resources_ui.inc.php +++ b/resources/inc/class.resources_ui.inc.php @@ -509,7 +509,7 @@ class resources_ui // Set original size picture $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); - + $content['quantity'] = $content['quantity'] ? $content['quantity'] : 1; $content['useable'] = $content['useable'] ? $content['useable'] : 1; $content['accessory_of'] = $content['accessory_of'] ? $content['accessory_of'] : $accessory_of; @@ -647,10 +647,10 @@ class resources_ui $selectbox = html::select( 'owner', $selected, - array_merge($resources,$res_cats), - $no_lang=true, - $options=' style="width: 100%;" id="uical_select_resource"', - $multiple=4, + $options=array_merge(array('r0' => lang('None')),$resources,$res_cats), + true, // no lang + ' style="width: 100%;" id="uical_select_resource"', + min(4, count($options)), // multiple false ); return array(