1 files changed, 20 insertions, 0 deletions
diff --git a/chimere/main/forms.py b/chimere/main/forms.py
index e1e3168..11b1d99 100644
--- a/chimere/main/forms.py
+++ b/chimere/main/forms.py
@@ -33,6 +33,22 @@ from chimere.main.models import Marker, Route, PropertyModel, Property, Area,\
                                 News, Category, SubCategory
 from chimere.main.widgets import AreaField, PointField, TextareaWidget
 
+from datetime import timedelta, datetime, tzinfo
+
+ZERO = timedelta(0)
+
+class UTC(tzinfo):
+    """UTC time zone"""
+
+    def utcoffset(self, dt):
+        return ZERO
+
+    def tzname(self, dt):
+        return settings.TIME_ZONE
+
+    def dst(self, dt):
+        return ZERO
+
 def notifyStaff(subject, body, sender=None):
     if not settings.EMAIL_HOST:
         return
@@ -136,6 +152,10 @@ required=False)' % (property.order, property.id, property.name,
         new_marker = super(MarkerAdminForm, self).save(*args, **keys)
         if 'status' not in self.cleaned_data:
             new_marker.status = 'S'
+        if new_marker.status == 'A':
+            tz = UTC()
+            new_marker.available_date = datetime.replace(datetime.utcnow(),
+                                                         tzinfo=tz)
         new_marker.save()
         # save each property
         for propertymodel in PropertyModel.objects.filter(available=True):