Don't delete exceptions and completions when saving.

Conflicts: kronolith/templates/dynamic/edit.inc kronolith/templates/dynamic/task.inc nag/lib/Task.php
horde · Jun 1, 2015 · 109fc94 · 109fc94
1 parent 26f6bf4
commit 109fc94
Show file tree

Hide file tree

Showing 7 changed files with 54 additions and 21 deletions.
diff --git a/kronolith/js/kronolith.js b/kronolith/js/kronolith.js
@@ -6605,6 +6605,10 @@ KronolithCore = {
         } else {
             $(prefix + 'RepeatLength').down('input[name=recur_end_type][value=none]').setValue(true);
         }
+        $(prefix + 'Exceptions').setValue(recur.ex || '');
+        if ($(prefix + 'Completions')) {
+            $(prefix + 'Completions').setValue(recur.co || '');
+        }
         this.toggleRecurrence(event, scheme);
     },
 

diff --git a/kronolith/lib/Event.php b/kronolith/lib/Event.php
@@ -3156,12 +3156,19 @@ static public function readRecurrenceForm($start, $timezone,
             break;
         }
 
-        if ($exceptions = Horde_Util::getFormData('exceptions')) {
-            foreach ($exceptions as $exception) {
-                $recurrence->addException(
-                    (int)substr($exception, 0, 4),
-                    (int)substr($exception, 4, 2),
-                    (int)substr($exception, 6, 2));
+        foreach (array('exceptions', 'completions') as $what) {
+            if ($data = Horde_Util::getFormData($what)) {
+                if (!is_array($data)) {
+                    $data = explode(',', $data);
+                }
+                foreach ($data as $date) {
+                    list($year, $month, $mday) = sscanf($date, '%04d%02d%02d');
+                    if ($what == 'exceptions') {
+                        $recurrence->addException($year, $month, $mday);
+                    } else {
+                        $recurrence->addCompletion($year, $month, $mday);
+                    }
+                }
             }
         }
 

diff --git a/kronolith/templates/dynamic/edit.inc b/kronolith/templates/dynamic/edit.inc
@@ -141,6 +141,7 @@
 </div>
 
 <div id="kronolithEventTabRecur" class="kronolithTabsOption" style="display:none">
+  <input type="hidden" id="kronolithEventExceptions" name="exceptions" />
   <div id="kronolithEventRepeatType" style="display:none">
     <?php printf(_("%s Don't repeat %s or repeat %s daily, %s weekly, %s monthly %s or %s yearly %s"),
     '<label for="kronolithEventLinkNone"><input type="radio" name="recur" value="' . Horde_Date_Recurrence::RECUR_NONE . '" checked="checked" id="kronolithEventLinkNone" />', '</label>',

diff --git a/kronolith/templates/dynamic/task.inc b/kronolith/templates/dynamic/task.inc
@@ -96,6 +96,8 @@
 </div>
 
 <div id="kronolithTaskTabRecur" class="kronolithTabsOption" style="display:none">
+  <input type="hidden" id="kronolithTaskExceptions" name="exceptions" />
+  <input type="hidden" id="kronolithTaskCompletions" name="completions" />
   <div id="kronolithTaskRepeatType" style="display:none">
     <?php printf(_("%s Don't repeat %s or repeat %s daily, %s weekly, %s monthly %s or %s yearly %s"),
     '<label for="kronolithTaskLinkNone"><input type="radio" name="recur" value="' . Horde_Date_Recurrence::RECUR_NONE . '" checked="checked" id="kronolithTaskLinkNone" />', '</label>',

diff --git a/nag/lib/Form/Type/NagRecurrence.php b/nag/lib/Form/Type/NagRecurrence.php
@@ -107,12 +107,16 @@ public function getInfo(&$vars, &$var, &$info)
             break;
         }
 
-        if ($vars->exceptions) {
-            foreach ($vars->exceptions as $exception) {
-                $recurrence->addException(
-                    (int)substr($exception, 0, 4),
-                    (int)substr($exception, 4, 2),
-                    (int)substr($exception, 6, 2));
+        foreach (array('exceptions', 'completions') as $what) {
+            if ($vars->$what) {
+                foreach ($vars->$what as $date) {
+                    list($year, $month, $mday) = sscanf($date, '%04d%02d%02d');
+                    if ($what == 'exceptions') {
+                        $recurrence->addException($year, $month, $mday);
+                    } else {
+                        $recurrence->addCompletion($year, $month, $mday);
+                    }
+                }
             }
         }
 

diff --git a/nag/lib/Task.php b/nag/lib/Task.php
@@ -555,15 +555,14 @@ public function toggleComplete()
             $this->completed_date = null;
             $this->completed = false;
             if ($this->recurs()) {
-                /* What do we want do delete here? All completions?
-                 * The latest completion? Any completion in the
-                 * future?. */
-                foreach ($this->recurrence->getCompletions() as $completion) {
-                    $this->recurrence->deleteCompletion(
-                        substr($completion, 0, 4),
-                        substr($completion, 4, 2),
-                        substr($completion, 6, 2));
-                }
+                /* Only delete the latest completion. */
+                $completions = $this->recurrence->getCompletions();
+                sort($completions);
+                list($year, $month, $mday) = sscanf(
+                    end($completions),
+                    '%04d%02d%02d'
+                );
+                $this->recurrence->deleteCompletion($year, $month, $mday);
             }
             return;
         }

diff --git a/nag/lib/Ui/VarRenderer/Nag.php b/nag/lib/Ui/VarRenderer/Nag.php
@@ -368,6 +368,22 @@ public function _renderVarInput_NagRecurrence($form, $var, $vars)
             Horde::label('recur_count', _("recurrences"))
         );
 
+        /* Exceptions and completions. */
+        if ($recur) {
+            foreach ($recur->getExceptions() as $exception) {
+                $html .= sprintf(
+                    '<input type="hidden" name="exceptions[]" value="%s" />',
+                    $exception
+                );
+            }
+            foreach ($recur->getCompletions() as $completion) {
+                $html .= sprintf(
+                    '<input type="hidden" name="completions[]" value="%s" />',
+                    $completion
+                );
+            }
+        }
+
         return $html;
     }