Changeset 9dfb3d5

Timestamp:

Mar 27, 2012, 6:15:39 AM (14 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, space-access, stable, stage

Children:

0d5dc3b

Parents:

b2d74ac

git-author:

Alex Dehnert <adehnert@…> (03/27/12 06:15:39)

git-committer:

Alex Dehnert <adehnert@…> (03/27/12 06:15:39)

Message:

Improve handling of start/end times

Both fixes and actual bug, and makes it more the default to have
SpaceAccessControlListEntry?'s start and end slightly now, so that the
simple start <= now <= end test actually works.

File:

• asadb/space/models.py (modified) (4 diffs)

asadb/space/models.py

@@ -9 +9 @@
 import groups.models
 
-# Create your models here.
+EXPIRE_OFFSET   = datetime.timedelta(seconds=1)
 
 class Space(models.Model):
@@ -124 +124 @@
         )
 
+def now_offset():
+    return datetime.datetime.now()-EXPIRE_OFFSET
+
 class SpaceAccessListEntry(models.Model):
     END_NEVER       = datetime.datetime.max
@@ -129 +132 @@
     group = models.ForeignKey(groups.models.Group)
     space = models.ForeignKey(Space)
-    start = models.DateTimeField(default=datetime.datetime.now)
+    start = models.DateTimeField(default=now_offset)
     end = models.DateTimeField(default=END_NEVER)
 
@@ -139 +142 @@
 
     def expire(self, ):
-        self.end_time = datetime.datetime.now()-self.EXPIRE_OFFSET
+        self.end = now_offset()
         self.save()