extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-20 09:58:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Send some refresh commands when deleting

Browse Source
This commit is contained in:
Nathan Gray 2015-11-17 21:32:46 +00:00
parent c3464e4552
commit 22e4fc038f
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
calendar/inc/class.calendar_uilist.inc.php
View File

@ -670,6 +670,11 @@ class calendar_uilist extends calendar_ui
} }
} }
} }
if(egw_json_response::isJSONResponse())
{
egw_json_response::get()->call('egw.refresh','','calendar',$id,'delete');
}
} }
else else
{ {
@ -690,6 +695,12 @@ class calendar_uilist extends calendar_ui
if($this->bo->save($event)) if($this->bo->save($event))
{ {
$success++; $success++;
if(egw_json_response::isJSONResponse())
{
egw_json_response::get()->call('egw.dataStoreUID','calendar::'.$id,$this->to_client($this->bo->read($id,$recur_date)));
egw_json_response::get()->call('egw.refresh','','calendar',$id,'edit');
}
break; break;
} }
} }
@ -708,6 +719,10 @@ class calendar_uilist extends calendar_ui
if ($this->bo->set_status($event,$GLOBALS['egw_info']['user']['account_id'],$new_status,$recur_date, if ($this->bo->set_status($event,$GLOBALS['egw_info']['user']['account_id'],$new_status,$recur_date,
false,true,$skip_notification)) false,true,$skip_notification))
{ {
if(egw_json_response::isJSONResponse())
{
egw_json_response::get()->call('egw.dataStoreUID','calendar::'.$id,$this->to_client($this->bo->read($id,$recur_date)));
}
$success++; $success++;
//$msg = lang('Status changed'); //$msg = lang('Status changed');
} }

1
calendar/js/app.js
View File

@ -270,6 +270,7 @@ app.classes.calendar = AppJS.extend(
if(_type === 'delete') if(_type === 'delete')
{ {
daywise.splice(daywise.indexOf(_id),1); daywise.splice(daywise.indexOf(_id),1);
egw.dataStoreUID('calendar::'+_id, null);
} }
else if (daywise.indexOf(_id) < 0) else if (daywise.indexOf(_id) < 0)
{ {

4
calendar/js/et2_widget_event.js
View File

@ -488,8 +488,8 @@ var et2_calendar_event = et2_valueWidget.extend([et2_IDetachedDOM],
_sameday_check: function(event) _sameday_check: function(event)
{ {
// Event somehow got orphaned // Event somehow got orphaned, or deleted
if(!this._parent) if(!this._parent || event === null)
{ {
return false; return false;
} }