extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-26 16:48:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Calendar - Fix edit via emailed notification link did not work properly

Browse Source
This commit is contained in:
nathangray 2017-06-22 11:03:28 -06:00
parent 4bdde714e1
commit a44bdb99f9
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1805,7 +1805,7 @@ class calendar_boupdate extends calendar_bo
$event_arr['link']['field'] = lang('URL'); $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 $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 url is only a path, try guessing the rest ;-)
if ($link[0] == '/') if ($link[0] == '/')
{ {

12
calendar/js/app.js
View File

@ -194,9 +194,12 @@ app.classes.calendar = (function(){ "use strict"; return AppJS.extend(
jQuery(_et2.DOMContainer).hide(); jQuery(_et2.DOMContainer).hide();
// Set client side holiday cache for this year // Set client side holiday cache for this year
egw.window.et2_calendar_view.holiday_cache[content.data.year] = content.data.holidays; if(egw.window.et2_calendar_view)
delete content.data.holidays; {
delete content.data.year; 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(); this._setup_sidebox_filters();
@ -236,6 +239,9 @@ app.classes.calendar = (function(){ "use strict"; return AppJS.extend(
{ {
this.et2.getWidgetById('title').input.select(); this.et2.getWidgetById('title').input.select();
} }
// Disable loading prompt (if loaded nopopup)
egw.loading_prompt(this.appname,false);
break; break;
case 'calendar.freetimesearch': case 'calendar.freetimesearch':