[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[18458] branches/3.0

[<ny...@us...>]

Revision: 18458
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=18458&view=rev
Author:   nyloth
Date:     2009-05-04 20:27:57 +0000 (Mon, 04 May 2009)

Log Message:
-----------
[FIX] calendars: fix recurrence in preview mode (thx xavi for reporting)

Modified Paths:
--------------
    branches/3.0/templates/tiki-calendar_edit_item.tpl
    branches/3.0/tiki-calendar_edit_item.php

Modified: branches/3.0/templates/tiki-calendar_edit_item.tpl
===================================================================
--- branches/3.0/templates/tiki-calendar_edit_item.tpl	2009-05-04 20:19:58 UTC (rev 18457)
+++ branches/3.0/templates/tiki-calendar_edit_item.tpl	2009-05-04 20:27:57 UTC (rev 18458)
@@ -88,7 +88,7 @@
 	<input type="hidden" name="recurrent" value="1"/>
 		{tr}This event depends on a recurrence rule{/tr}
 	{else}
-<input type="checkbox" id="id_recurrent" name="recurrent" value="1" onClick="toggle('recurrenceRules');toggle('startdate');toggle('enddate');"{if $calitem.recurrenceId gt 0}checked="checked"{/if}/><label for="id_recurrent">{tr}This event depends on a recurrence rule{/tr}</label>
+<input type="checkbox" id="id_recurrent" name="recurrent" value="1" onClick="toggle('recurrenceRules');toggle('startdate');toggle('enddate');"{if $calitem.recurrenceId gt 0 or $recurrent eq 1}checked="checked"{/if}/><label for="id_recurrent">{tr}This event depends on a recurrence rule{/tr}</label>
 	{/if}
 {else}
 	<span class="summary">{if $calitem.recurrenceId gt 0}{tr}This event depends on a recurrence rule{/tr}{else}{tr}This event is not recurrent{/tr}{/if}</span>
@@ -99,7 +99,7 @@
 	<td>&nbsp;</td>
 	<td style="padding:5px 10px">
 {if $edit}
-	  <div id="recurrenceRules" style="position:relative;top:0px;left:0px;width:100%;{if !($calitem.recurrenceId gt 0) && $prefs.javascript_enabled eq 'y'}display:none;{/if}">
+	  <div id="recurrenceRules" style="position:relative;top:0px;left:0px;width:100%;display:{if ( !($calitem.recurrenceId gt 0) and $recurrent neq 1 ) && $prefs.javascript_enabled eq 'y'}none{else}block{/if};">
 	  {if $calitem.recurrenceId gt 0}<input type="hidden" name="recurrenceId" value="{$recurrence.id}" />{/if}
 {if $recurrence.id gt 0}
 	{if $recurrence.weekly}

Modified: branches/3.0/tiki-calendar_edit_item.php
===================================================================
--- branches/3.0/tiki-calendar_edit_item.php	2009-05-04 20:19:58 UTC (rev 18457)
+++ branches/3.0/tiki-calendar_edit_item.php	2009-05-04 20:27:57 UTC (rev 18458)
@@ -46,6 +46,7 @@
 $smarty->assign('monthnames',$monthnames);
 
 $smarty->assign('edit',false);
+$smarty->assign('recurrent', '');
 $hours_minmax = '';
 
 if ($tiki_p_admin_calendar == 'y') {
@@ -379,6 +380,24 @@
 	$save['parsedName'] = $tikilib->parse_data($save['name']);
 	$id = $save['calitemId'];
 	$calitem = $save;
+
+	$recurrence = array(
+		'weekly' => isset($_POST['recurrenceType']) && $_POST['recurrenceType'] = 'weekly',
+		'weekday' => isset($_POST['weekday']) ? $_POST['weekday'] : '',
+		'monthly' => isset($_POST['recurrenceType']) && $_POST['recurrenceType'] = 'monthly',
+		'dayOfMonth' => isset($_POST['dayOfMonth']) ? $_POST['dayOfMonth'] : '',
+		'yearly' => isset($_POST['recurrenceType']) && $_POST['recurrenceType'] = 'yearly',
+		'dateOfYear_day' => isset($_POST['dateOfYear_day']) ? $_POST['dateOfYear_day'] : '',
+		'dateOfYear_month' => isset($_POST['dateOfYear_month']) ? $_POST['dateOfYear_month'] : '',
+		'startPeriod' => isset($_POST['startPeriod']) ? $_POST['startPeriod'] : '',
+		'nbRecurrences' => isset($_POST['nbRecurrences']) ? $_POST['nbRecurrences'] : '',
+		'endPeriod' => isset($_POST['endPeriod']) ? $_POST['endPeriod'] : ''
+	);	
+	if ( isset($_POST['recurrent']) && $_POST['recurrent'] == 1 ) {
+		$smarty->assign('recurrent', $_POST['recurrent']);
+	}
+	$smarty->assign_by_ref('recurrence', $recurrence);
+	
 	$calendar = $calendarlib->get_calendar($calitem['calendarId']);
 	$smarty->assign('edit',true);
 	$smarty->assign('preview', isset($_REQUEST['preview']));


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.