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

Allow viewing / editing deleted exceptions by editing the series

Browse Source
This commit is contained in:
Nathan Gray 2012-11-09 17:14:02 +00:00
parent ec2f7879d4
commit 5057d1735e
3 changed files with 13 additions and 5 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

@ -1496,7 +1496,7 @@ function replace_eTemplate_onsubmit()
{ {
$content['alarm'] = false; $content['alarm'] = false;
} }
$content['msg'] = $msg; $content['msg'] = $msg ? $msg : $_GET['msg'];
if ($view) if ($view)
{ {

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

@ -364,11 +364,11 @@ class calendar_uilist extends calendar_ui
{ {
$event['class'] .= 'rowDeleted '; $event['class'] .= 'rowDeleted ';
} }
// Disable everything for 'deleted' exceptions - there's nothing // Disable delete for 'deleted' exceptions - deleting the exception
// logical to do except undelete it // would put it back, which you do from the series, not purge it
if($search_params['filter'] == 'deleted' && $event['recur_type']) if($search_params['filter'] == 'deleted' && $event['recur_type'])
{ {
$event['class'] .= ' rowNoView rowNoDelete rowDeleted'; $event['class'] .= ' rowDeleted rowNoDelete';
} }
// Filemanager disabled for other applications // Filemanager disabled for other applications

10
calendar/js/app.js
View File

@ -53,11 +53,19 @@ function cal_open(_action, _senders)
var id = _senders[0].id; var id = _senders[0].id;
var matches = id.match(/^(?:calendar::)?([0-9]+):([0-9]+)$/); var matches = id.match(/^(?:calendar::)?([0-9]+):([0-9]+)$/);
var backup = _action.data; var backup = _action.data;
if (matches) var row = _senders[0].iface.node;
if (matches && !$j(row).hasClass("rowDeleted"))
{ {
edit_series(matches[1],matches[2]); edit_series(matches[1],matches[2]);
return; return;
} }
else if (matches && $j(row).hasClass("rowDeleted") && _action.data.url)
{
// Trying to edit a deleted exception, use original event & add a message
_senders[0].id = matches[1];
_action.data.url += '&msg='+encodeURIComponent(egw.lang('Editing series'));
}
else if (matches = id.match(/^([a-z_-]+)([0-9]+)/i)) else if (matches = id.match(/^([a-z_-]+)([0-9]+)/i))
{ {
var app = matches[1]; var app = matches[1];