extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-03 04:29:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Calendar - fix a few more missed ajax=true that were causing problems loading

Browse Source
This commit is contained in:
nathangray 2017-10-05 11:20:21 -06:00
parent a09ab65973
commit 6f12a443e5
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1069,6 +1069,7 @@ class calendar_uiforms extends calendar_ui
Egw::redirect_link('/index.php',array( Egw::redirect_link('/index.php',array(
'menuaction' => 'calendar.calendar_uiviews.index', 'menuaction' => 'calendar.calendar_uiviews.index',
'msg' => $msg, 'msg' => $msg,
'ajax' => 'true'
)); ));
} }
if (in_array($button,array('delete_exceptions','delete_keep_exceptions')) || $content['recur_type'] && $button == 'delete') if (in_array($button,array('delete_exceptions','delete_keep_exceptions')) || $content['recur_type'] && $button == 'delete')
@ -1847,7 +1848,7 @@ class calendar_uiforms extends calendar_ui
if ($preserved['no_popup']) if ($preserved['no_popup'])
{ {
// If not a popup, load the normal calendar interface on cancel // If not a popup, load the normal calendar interface on cancel
$etpl->set_cell_attribute('button[cancel]','onclick','app.calendar.linkHandler(\'index.php?menuaction=calendar.calendar_uiviews.index\')'); $etpl->set_cell_attribute('button[cancel]','onclick','app.calendar.linkHandler(\'index.php?menuaction=calendar.calendar_uiviews.index&ajax=true\')');
} }
// Allow admins to restore deleted events // Allow admins to restore deleted events

1
calendar/inc/class.calendar_uiviews.inc.php
View File

@ -454,6 +454,7 @@ class calendar_uiviews extends calendar_ui
Egw::redirect_link('/index.php',array( Egw::redirect_link('/index.php',array(
'menuaction' => 'calendar.calendar_uiviews.index', 'menuaction' => 'calendar.calendar_uiviews.index',
'msg' => $merge, 'msg' => $merge,
'ajax' => 'true'
)); ));
} }