From 63e9d5351b6c355120f83bd3d7f17624999c4fc9 Mon Sep 17 00:00:00 2001
From: Jan Schneider <jan@horde.org>
Date: Mon, 16 Nov 2009 18:58:01 +0100
Subject: [PATCH] Fix deleting and moving events through the event form.

---
 kronolith/js/kronolith.js          | 16 ++++++++++++----
 kronolith/templates/index/edit.inc |  3 ++-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/kronolith/js/kronolith.js b/kronolith/js/kronolith.js
index 366e1631a..c67767c79 100644
--- a/kronolith/js/kronolith.js
+++ b/kronolith/js/kronolith.js
@@ -2225,10 +2225,16 @@ KronolithCore = {
                                   if (r.response.deleted) {
                                       this._removeEvent(eventid, cal);
                                   } else {
-                                      $('kronolithBody').select('div').findAll(function(el) { return el.retrieve('calendar') == cal && el.retrieve('eventid') == eventid; }).invoke('toggle');
+                                      $('kronolithBody').select('div').findAll(function(el) {
+                                          return el.retrieve('calendar') == cal &&
+                                              el.retrieve('eventid') == eventid;
+                                      }).invoke('toggle');
                                   }
                               }.bind(this));
-                $('kronolithBody').select('div').findAll(function(el) { return el.retrieve('calendar') == cal && el.retrieve('eventid') == eventid; }).invoke('hide');
+                $('kronolithBody').select('div').findAll(function(el) {
+                    return el.retrieve('calendar') == cal &&
+                        el.retrieve('eventid') == eventid;
+                }).invoke('hide');
                 this._closeRedBox();
                 window.history.back();
                 e.stop();
@@ -2539,7 +2545,7 @@ KronolithCore = {
             RedBox.onDisplay = null;
         };
 
-        this.updateCalendarDropDown('kronolithEventCalendar');
+        this.updateCalendarDropDown('kronolithEventTarget');
         $('kronolithEventForm').enable();
         $('kronolithEventForm').reset();
         this.doAction('ListTopTags', {}, this._topTags);
@@ -2550,7 +2556,8 @@ KronolithCore = {
             $('kronolithEventTags').autocompleter.init();
             var d = date ? this.parseDate(date) : new Date();
             $('kronolithEventId').clear();
-            $('kronolithEventCalendar').setValue(Kronolith.conf.default_calendar);
+            $('kronolithEventCalendar').clear();
+            $('kronolithEventTarget').setValue(Kronolith.conf.default_calendar);
             $('kronolithEventDelete').hide();
             $('kronolithEventStartDate').setValue(d.toString(Kronolith.conf.date_format));
             $('kronolithEventStartTime').setValue(d.toString(Kronolith.conf.time_format));
@@ -2647,6 +2654,7 @@ KronolithCore = {
         /* Basic information */
         $('kronolithEventId').setValue(ev.id);
         $('kronolithEventCalendar').setValue(ev.ty + '|' + ev.c);
+        $('kronolithEventTarget').setValue(ev.ty + '|' + ev.c);
         $('kronolithEventTitle').setValue(ev.t);
         $('kronolithEventLocation').setValue(ev.l);
         $('kronolithEventAllday').setValue(ev.al);
diff --git a/kronolith/templates/index/edit.inc b/kronolith/templates/index/edit.inc
index ca2fcaabc..f01114d3f 100644
--- a/kronolith/templates/index/edit.inc
+++ b/kronolith/templates/index/edit.inc
@@ -1,6 +1,7 @@
 <div id="kronolithEventDialog" style="display:none">
 <form id="kronolithEventForm" action="">
 <input id="kronolithEventId" type="hidden" name="id" />
+<input id="kronolithEventCalendar" type="hidden" name="cal" />
 
 <div>
   <label for="kronolithEventTitle"><?php echo _("Event title") ?>:</label><br />
@@ -10,7 +11,7 @@
 <table cellspacing="0" cellpadding="0" border="0"><tbody><tr>
   <td>
     <label for="kronolithEventCalendar"><?php echo _("Calendar") ?>:</label><br />
-    <select name="cal" id="kronolithEventCalendar">
+    <select name="targetcalendar" id="kronolithEventTarget">
     </select>
   </td>
   <td>
-- 
2.11.0