extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-26 16:48:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Calendar/Resources: do NOT unselect currently selected calendars when selecting a resource category, eg. to choose a meeting room

Browse Source
This commit is contained in:
Ralf Becker 2012-01-09 21:26:41 +00:00
parent 1c52c64ba2
commit 11e6879aac
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
calendar/inc/class.calendar_ui.inc.php
View File

@ -794,7 +794,7 @@ class calendar_ui
$file[] = array( $file[] = array(
'text' => " 'text' => "
<script type=\"text/javascript\"> <script type=\"text/javascript\">
function load_cal(url,id) { function load_cal(url,id,no_reset) {
var owner=''; var owner='';
var i = 0; var i = 0;
selectBox = document.getElementById(id); selectBox = document.getElementById(id);
@ -804,7 +804,8 @@ function load_cal(url,id) {
} }
} }
if (owner) { 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> </script>

2
resources/inc/class.resources_ui.inc.php
View File

@ -729,7 +729,7 @@ class resources_ui
array_merge($resources,$res_cats), array_merge($resources,$res_cats),
$no_lang=true, $no_lang=true,
$options='style="width: 100%;" onchange="load_cal(\''. $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 $multiple=count($selected) ? 4 : 0
); );
return array( return array(