holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed bug reported from Adriano on the user-list: daily matrix view gives warning if no participants selected.

Browse Source 
Also fixed not working switch between daily and weekly view.
This commit is contained in:
Ralf Becker 2005-02-09 23:13:23 +00:00
parent f368adc1ae
commit 9b52f5fba5
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
calendar/inc/class.uicalendar.inc.php
View File

@ -2311,7 +2311,7 @@
} }
$var[] = Array( $var[] = Array(
'field' => lang('Participants'), 'field' => lang('Participants'),
'data' => "\n ".$GLOBALS['phpgw']->uiaccountsel->selection('participants[]','uicalendar_matrix_users',array(),'calendar+',$size,False,'','',$users) 'data' => "\n ".$GLOBALS['phpgw']->uiaccountsel->selection('participants[]','uicalendar_matrix_users',array($this->bo->owner),'calendar+',$size,False,'','',$users)
); );
for($i=0;$i<count($var);$i++) for($i=0;$i<count($var);$i++)
@ -2348,7 +2348,7 @@
// fetch participatns from get and post var // fetch participatns from get and post var
$participants = get_var("participants", array("GET", "POST")); $participants = get_var("participants", array("GET", "POST"));
// Defined - into session - who participates // Defined - into session - who participates
$GLOBALS['phpgw']->session->appsession("participants_matrix", "calendar", implode(";", $participants)); $GLOBALS['phpgw']->session->appsession("participants_matrix", "calendar", implode(";",(array)$participants));
} }
$date["year"] = get_var("year", array("GET", "POST")); $date["year"] = get_var("year", array("GET", "POST"));
$date["month"] = get_var("month", array("GET", "POST")); $date["month"] = get_var("month", array("GET", "POST"));
@ -2393,7 +2393,8 @@
if ($this->always_app_header) $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['calendar']['title'].' - '.lang('Matrixview'); if ($this->always_app_header) $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['calendar']['title'].' - '.lang('Matrixview');
$GLOBALS['phpgw']->common->phpgw_header(); $GLOBALS['phpgw']->common->phpgw_header();
switch($_POST['matrixtype']) $matrixtype = $_POST['oneday'] ? 'free/busy' : ($_POST['sevendays'] ? 'weekly' : $_POST['matrixtype']);
switch($matrixtype)
{ {
case 'free/busy': case 'free/busy':
$freetime = $GLOBALS['phpgw']->datetime->gmtdate(mktime(0,0,0,$this->bo->month,$this->bo->day,$this->bo->year)); $freetime = $GLOBALS['phpgw']->datetime->gmtdate(mktime(0,0,0,$this->bo->month,$this->bo->day,$this->bo->year));
@ -2411,7 +2412,7 @@
Array( Array(
'date' => sprintf("%04d%02d%02d",$this->bo->year,$this->bo->month,$this->bo->day), 'date' => sprintf("%04d%02d%02d",$this->bo->year,$this->bo->month,$this->bo->day),
'showyear' => true, 'showyear' => true,
'owners' => $participants 'owners' => $participants[0] ? $participants : $this->bo->owner,
) )
); );
break; break;
@ -2421,20 +2422,17 @@
echo ' '.$this->html->input_hidden('year',$this->bo->year); echo ' '.$this->html->input_hidden('year',$this->bo->year);
echo ' '.$this->html->input_hidden('month',$this->bo->month); echo ' '.$this->html->input_hidden('month',$this->bo->month);
echo ' '.$this->html->input_hidden('day',$this->bo->day); echo ' '.$this->html->input_hidden('day',$this->bo->day);
echo ' '.$this->html->input_hidden('matrixtype',$_POST['matrixtype']); echo ' '.$this->html->input_hidden('matrixtype',$matrixtype);
echo ' '.$this->html->input_hidden('matrix', 1); echo ' '.$this->html->input_hidden('matrix', 1);
echo ' <input type="submit" name="refresh" value="'.lang('Refresh').'">'."\n"; echo ' <input type="submit" name="refresh" value="'.lang('Refresh').'">'."\n";
echo ' </td><td>'."\n"; echo ' </td><td>'."\n";
echo ' <input type="submit" name="cancel" value="'.lang('Cancel').'">'."\n"; echo ' <input type="submit" name="cancel" value="'.lang('Cancel').'">'."\n";
// Seven days // Seven days
if( get_var("matrixtype", array("GET", "POST")) == "free/busy" ) if($matrixtype == 'free/busy')
{ echo ' <input type="submit" name="sevendays" value="'.lang('Show next seven days').'">'."\n";
if( !get_var("sevendays", array("GET", "POST")) ) else
echo ' <input type="submit" name="sevendays" value="'.lang('Show next seven days').'">'."\n"; echo ' <input type="submit" name="oneday" value="'.lang('Show only one day').'">'."\n";
else
echo ' <input type="submit" name="oneday" value="'.lang('Show only one day').'">'."\n";
}
echo ' </td></tr></table>'."\n"; echo ' </td></tr></table>'."\n";
echo '</form>'."\n"; echo '</form>'."\n";