X-Git-Url: https://git.realraum.at/?p=svn42.git;a=blobdiff_plain;f=grical-patchqueue%2Fical_endtime;fp=grical-patchqueue%2Fical_endtime;h=0000000000000000000000000000000000000000;hp=eb55e465944c5f1c0d9cd9e7edf022e2e80901c6;hb=5b00dab1a7d2ac2d8a593f0bd6e85a7194e2c9bd;hpb=8e8f26d01ab21db191f62f2732808dcb75e8a74f

diff --git a/grical-patchqueue/ical_endtime b/grical-patchqueue/ical_endtime
deleted file mode 100644
index eb55e46..0000000
--- a/grical-patchqueue/ical_endtime
+++ /dev/null
@@ -1,30 +0,0 @@
-# HG changeset patch
-# Parent 054c3747b6957662fabfa7837ac78952d50be72c
-
-diff -r 054c3747b695 grical/events/models.py
---- a/grical/events/models.py	Tue Aug 27 15:16:13 2013 +0200
-+++ b/grical/events/models.py	Sun Dec 01 23:04:05 2013 +0100
-@@ -1116,12 +1116,12 @@
-                 + unicode(self.id) + u'@' + \
-                 Site.objects.get_current().domain
-         # calculate DTEND
--        if self.enddate and self.enddate != self.startdate:
-+        if (self.enddate and self.enddate != self.startdate) or (self.endtime and self.endtime != self.starttime):
-             # rfc2445 (iCalendar) indicates that:
-             # - DTEND can be omitted when equals DTSTART
-             # - DTEND specifies the non-inclusive end of the event
--            enddate = self.enddate + datetime.timedelta(days=1)
-             if self.endtime:
-+                enddate = self.enddate if self.enddate else self.startdate
-                 date_time = datetime.datetime.combine(
-                         enddate, self.endtime )
-                 if self.timezone:
-@@ -1130,7 +1130,7 @@
-                     date_time = loc_dt.astimezone( pytz.utc )
-                 vevent.add('DTEND').value = date_time
-             else:
--                vevent.add('DTEND').value = enddate
-+                vevent.add('DTEND').value = self.enddate + datetime.timedelta(days=1)
-         # calculate DESCRIPTION
-         if self.description: vevent.add('DESCRIPTION').value = self.description
-         # see rfc5545 3.8.7.2. Date-Time Stamp