From a44bdb99f92ccb05b5f35d2c354e49a9d2a4ab35 Mon Sep 17 00:00:00 2001 From: nathangray Date: Thu, 22 Jun 2017 11:03:28 -0600 Subject: [PATCH] * Calendar - Fix edit via emailed notification link did not work properly --- calendar/inc/class.calendar_boupdate.inc.php | 2 +- calendar/js/app.js | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/calendar/inc/class.calendar_boupdate.inc.php b/calendar/inc/class.calendar_boupdate.inc.php index 49d4fc1d7d..fe2ca7357a 100644 --- a/calendar/inc/class.calendar_boupdate.inc.php +++ b/calendar/inc/class.calendar_boupdate.inc.php @@ -1805,7 +1805,7 @@ class calendar_boupdate extends calendar_bo $event_arr['link']['field'] = lang('URL'); $eventStart_arr = $this->date2array($event['start']); // give this as 'date' to the link to pick the right recurrence for the participants state - $link = $GLOBALS['egw_info']['server']['webserver_url'].'/index.php?menuaction=calendar.calendar_uiforms.edit&cal_id='.$event['id'].'&date='.$eventStart_arr['full'].'&no_popup=1'; + $link = $GLOBALS['egw_info']['server']['webserver_url'].'/index.php?menuaction=calendar.calendar_uiforms.edit&cal_id='.$event['id'].'&date='.$eventStart_arr['full'].'&no_popup=1&ajax=true'; // if url is only a path, try guessing the rest ;-) if ($link[0] == '/') { diff --git a/calendar/js/app.js b/calendar/js/app.js index 99b8c581c1..f5fb85280b 100644 --- a/calendar/js/app.js +++ b/calendar/js/app.js @@ -194,9 +194,12 @@ app.classes.calendar = (function(){ "use strict"; return AppJS.extend( jQuery(_et2.DOMContainer).hide(); // Set client side holiday cache for this year - egw.window.et2_calendar_view.holiday_cache[content.data.year] = content.data.holidays; - delete content.data.holidays; - delete content.data.year; + if(egw.window.et2_calendar_view) + { + egw.window.et2_calendar_view.holiday_cache[content.data.year] = content.data.holidays; + delete content.data.holidays; + delete content.data.year; + } this._setup_sidebox_filters(); @@ -236,6 +239,9 @@ app.classes.calendar = (function(){ "use strict"; return AppJS.extend( { this.et2.getWidgetById('title').input.select(); } + + // Disable loading prompt (if loaded nopopup) + egw.loading_prompt(this.appname,false); break; case 'calendar.freetimesearch':