extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 23:00:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

removed not used code and only query user what to do with exceptions, if we have some

Browse Source
This commit is contained in:
Ralf Becker 2011-04-08 14:21:23 +00:00
parent 2de73d86a5
commit 1d9f9e4ee3
3 changed files with 12 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1123,10 +1123,6 @@ class calendar_uiforms extends calendar_ui
}
}
}
if ($event['recur_type'] != MCAL_RECUR_NONE)
{
//$js .= $this->delete_series();
}
// set new start and end if given by $_GET
if(isset($_GET['start'])) { $event['start'] = $_GET['start']; }
if(isset($_GET['end'])) { $event['end'] = $_GET['end']; }
@ -1215,6 +1211,7 @@ function replace_eTemplate_onsubmit()
'tabs' => $preserv['tabs'],
'view' => $view,
'msg' => $msg,
'query_delete_exceptions' => (int)($event['recur_type'] && $event['recur_exception']),
));
$content['duration'] = $content['end'] - $content['start'];
if (isset($this->durations[$content['duration']])) $content['end'] = '';
@ -1422,7 +1419,6 @@ function replace_eTemplate_onsubmit()
{
$readonlys['recur_exception'] = !count($content['recur_exception']); // otherwise we get a delete button
$onclick =& $etpl->get_cell_attribute('button[delete]','onclick');
// $onclick = 'delete_series('.$event['id'].');';
$onclick = str_replace('Delete this event','Delete this series of recuring events',$onclick);
// some fundamental values of an existing series should not be changed by the user
@ -2122,7 +2118,8 @@ function replace_eTemplate_onsubmit()
/**
* Set up the required fields to get the history tab
*/
public function setup_history(&$content, &$sel_options) {
public function setup_history(&$content, &$sel_options)
{
$status = 'history_status';
$content['history'] = array(
@ -2180,38 +2177,4 @@ function replace_eTemplate_onsubmit()
}
}
}
/**
* Return HTML and Javascript to query user how to handle the exceptions while deleting the series
*
* Layout is defined in eTemplate 'calendar.delete_series'
*
* @param string $link=null url without cal_id and date GET parameters, default calendar.calendar_uiforms.edit
* @param string $target='_blank' target
* @return string
*/
function delete_series($link=null, $target='_blank')
{
if (is_null($link)) $link = egw::link('/index.php',array('menuaction'=>'calendar.calendar_uiforms.edit'));
return '
var calendar_edit_id;
function delete_series(id)
{
calendar_edit_id = id;
document.getElementById("delete_series").style.display = "inline";
return false;
}
function delete_exceptions(delete)
{
document.getElementById("delete_series").style.display = "none";
var extra = "&cal_id="+calendar_edit_id+"&action=delete";
if (delete) extra += "&exceptions=1";
'.$this->popup($link."'+extra+'").';
}';
}
}

4
calendar/setup/etemplates.inc.php
View File

File diff suppressed because one or more lines are too long

10
calendar/templates/default/edit.xet
View File

@ -305,7 +305,7 @@
</vbox>
</vbox>
</template>
<template id="calendar.edit" template="" lang="" group="0" version="1.7.003">
<template id="calendar.edit" template="" lang="" group="0" version="1.9.001">
<grid width="100%">
<columns>
<column width="100"/>
@ -322,7 +322,10 @@
</row>
<row class="th" height="28">
<description value="Title"/>
<textbox size="80" maxlength="255" span="all" needed="1" id="title"/>
<hbox options="0,0" span="all" needed="1">
<textbox size="75" maxlength="255" needed="1" id="title"/>
<description value="#%s" id="id" options="b"/>
</hbox>
</row>
<row>
<tabbox span="all" id="tabs">
@ -366,8 +369,9 @@
<menulist>
<menupopup onchange="this.form.submit(); this.value='';" id="action" options="Actions..." statustext="Execute a further action for this entry"/>
</menulist>
<checkbox label="Do not notify of these changes" id="no_notifications" span="2"/>
</hbox>
<button label="Delete" onclick="if ($cont[recur_type]) { getElementById('delete_series').style.display='block'; return false; } else return confirm('Delete this event');" align="right" id="button[delete]" statustext="Delete this event"/>
<button label="Delete" onclick="if ($cont[query_delete_exceptions]) { getElementById('delete_series').style.display='block'; return false; } else return confirm('Delete this event');" align="right" id="button[delete]" statustext="Delete this event"/>
</row>
<row disabled="!@recur_type">
<template span="all" id="calendar.delete_series"/>