Merge 0ab9a82 into 7ec9114

heynemann · Jun 8, 2015 · cb02623 · cb02623
2 parents 7ec9114 + 0ab9a82
commit cb02623
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/motorengine/fields/datetime_field.py b/motorengine/fields/datetime_field.py
@@ -35,12 +35,12 @@ def get_value(self, value):
         if self.auto_now_on_insert and value is None:
             return datetime.now()
 
-        if self.auto_now_on_update:
-            return datetime.now()
-
         return value
 
     def to_son(self, value):
+        if self.auto_now_on_update:
+            return datetime.now()
+
         if isinstance(value, six.string_types):
             return datetime.strptime(value, FORMAT)