Indicate that an event is an exception, and don't show the recurrence

related form fields.

diff --git a/kronolith/lib/Event.php b/kronolith/lib/Event.php
index f2bc69d..98fc166 100644 (file)
--- a/kronolith/lib/Event.php
+++ b/kronolith/lib/Event.php
@@ -1666,9 +1666,13 @@ abstract class Kronolith_Event
      */
     public function getRecurName()
     {
-        return $this->recurs()
-            ? $this->recurrence->getRecurName()
-            : _("No recurrence");
+        if (empty($this->baseid)) {
+            return $this->recurs()
+                ? $this->recurrence->getRecurName()
+                : _("No recurrence");
+        } else {
+            return _("Exception");
+        }
     }
 
     /**

diff --git a/kronolith/templates/edit/edit.inc b/kronolith/templates/edit/edit.inc
index 96c6151..e1c7e1a 100644 (file)
--- a/kronolith/templates/edit/edit.inc
+++ b/kronolith/templates/edit/edit.inc
@@ -271,6 +271,10 @@ if ($event->alarm) {
 </tr>
 <tbody id="section_recurrence">
 <tr>
+<?php if (!empty($event->baseid)):?>
+ <td>&nbsp;</td>
+ <td colspan="4"><?php echo sprintf(_("This is an exception to a recurring event originally scheduled on %s"), $event->exceptionoriginaldate->strftime($GLOBALS['prefs']->getValue('date_format')));?></td>
+<?php else:?>
  <td class="rightAlign" valign="top"><strong><?php echo Horde::label('recurnone', _("Pattern")) ?></strong></td>
  <td valign="top" colspan="4">
   <table cellspacing="0" width="100%">
@@ -386,6 +390,7 @@ endif;
  <?php endforeach; ?>
  </td>
 </tr>
+ <?php endif;?>
 <?php endif; ?>
 </tbody>