mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-08 09:04:53 +01:00
1 fix for setting response. 1 fix for weekly views.
This commit is contained in:
parent
02e64e4d90
commit
6ee87cd2b7
@ -1953,10 +1953,10 @@
|
|||||||
);
|
);
|
||||||
$this->output_template_array($p,'row','event',$var);
|
$this->output_template_array($p,'row','event',$var);
|
||||||
|
|
||||||
$original_owner = $this->bo->owner;
|
$original_owner = $this->bo->so->owner;
|
||||||
for($i=0;$i<$counter;$i++)
|
for($i=0;$i<$counter;$i++)
|
||||||
{
|
{
|
||||||
$this->so->owner = $owners_array[$i];
|
$this->bo->so->owner = $owners_array[$i];
|
||||||
$this->bo->store_to_cache(
|
$this->bo->store_to_cache(
|
||||||
Array(
|
Array(
|
||||||
'syear' => $year,
|
'syear' => $year,
|
||||||
@ -1967,7 +1967,7 @@
|
|||||||
$p->set_var('day_events',$this->display_week($start,True,$cellcolor,$display_name,$owners_array[$i]));
|
$p->set_var('day_events',$this->display_week($start,True,$cellcolor,$display_name,$owners_array[$i]));
|
||||||
$p->parse('row','event',True);
|
$p->parse('row','event',True);
|
||||||
}
|
}
|
||||||
$this->bo->owner = $original_owner;
|
$this->bo->so->owner = $original_owner;
|
||||||
$this->bo->printer_friendly = $true_printer_friendly;
|
$this->bo->printer_friendly = $true_printer_friendly;
|
||||||
return $p->fp('out','m_w_table');
|
return $p->fp('out','m_w_table');
|
||||||
}
|
}
|
||||||
@ -2640,7 +2640,7 @@
|
|||||||
while(list($param,$text) = each($response_choices))
|
while(list($param,$text) = each($response_choices))
|
||||||
{
|
{
|
||||||
$var = Array(
|
$var = Array(
|
||||||
'action_url_button' => $this->page('set_action',Array('cal_id'=>$cal_id,'action'=>$param)),
|
'action_url_button' => $this->page('set_action','&cal_id='.$cal_id.'&action='.$param),
|
||||||
'action_text_button' => ' '.$text.' ',
|
'action_text_button' => ' '.$text.' ',
|
||||||
'action_confirm_button' => '',
|
'action_confirm_button' => '',
|
||||||
'action_extra_field' => ''
|
'action_extra_field' => ''
|
||||||
|
Loading…
Reference in New Issue
Block a user