From 11e6879aace8b92d5032a892f4ff8b7245ff1598 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 9 Jan 2012 21:26:41 +0000
Subject: [PATCH] * Calendar/Resources: do NOT unselect currently selected
 calendars when selecting a resource category, eg. to choose a meeting room

---
 calendar/inc/class.calendar_ui.inc.php   | 5 +++--
 resources/inc/class.resources_ui.inc.php | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/calendar/inc/class.calendar_ui.inc.php b/calendar/inc/class.calendar_ui.inc.php
index 15966e216a..43d82ede3b 100644
--- a/calendar/inc/class.calendar_ui.inc.php
+++ b/calendar/inc/class.calendar_ui.inc.php
@@ -794,7 +794,7 @@ class calendar_ui
 			$file[] = array(
 				'text' => "
 <script type=\"text/javascript\">
-function load_cal(url,id) {
+function load_cal(url,id,no_reset) {
 	var owner='';
 	var i = 0;
 	selectBox = document.getElementById(id);
@@ -804,7 +804,8 @@ function load_cal(url,id) {
 		}
 	}
 	if (owner) {
-		egw_appWindow('calendar').location=url+'&owner=0,'+owner;
+		if (typeof no_reset == 'unknown') no_reset = false;
+		egw_appWindow('calendar').location=url+'&owner='+(no_reset?'':'0,')+owner;
 	}
 }
 </script>
diff --git a/resources/inc/class.resources_ui.inc.php b/resources/inc/class.resources_ui.inc.php
index fbbcff98a9..7486f4c908 100755
--- a/resources/inc/class.resources_ui.inc.php
+++ b/resources/inc/class.resources_ui.inc.php
@@ -729,7 +729,7 @@ class resources_ui
 				array_merge($resources,$res_cats),
 				$no_lang=true,
 				$options='style="width: 100%;" onchange="load_cal(\''.
-					egw::link('/index.php',$param,false).'\',\'uical_select_resource\');" id="uical_select_resource"',
+					egw::link('/index.php',$param,false).'\',\'uical_select_resource\',true);" id="uical_select_resource"',
 				$multiple=count($selected) ? 4 : 0
 			);
 			return array(