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

* Calendar: fix not working print view, if conventional add popup is enabled

Browse Source
This commit is contained in:
Ralf Becker 2019-09-25 10:56:36 +02:00
parent 1147069fcd
commit 33682e4824
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
calendar/inc/class.calendar_uiforms.inc.php
View File

@ -1515,7 +1515,7 @@ class calendar_uiforms extends calendar_ui
'no_popup' => isset($_GET['no_popup']),
'template' => isset($_GET['template']) ? $_GET['template'] : (isset($_REQUEST['print']) ? 'calendar.print' : 'calendar.edit'),
);
if($preserv['template'] && $this->cal_prefs['new_event_dialog'] == 'edit')
if(!isset($_REQUEST['print']) && !empty($preserv['template']) && $this->cal_prefs['new_event_dialog'] == 'edit')
{
// User wants full thing
unset($preserv['template']);

4
calendar/templates/default/print.xet
View File

@ -30,9 +30,7 @@
<description rows="1" cols="2" id="${row}[title]" no_lang="1"/>
<int id="${row}[quantity]" options="1,,3" readonly="true"/>
<checkbox id="${row}[status_recurrence]" align="center" readonly="true"/>
<menulist>
<menupopup id="${row}[status]" onchange="app.calendar.print_participants_status"/>
</menulist>
<select id="${row}[status]" onchange="app.calendar.print_participants_status" readonly="true"/>
</row>
</rows>
</grid>