fix the naive/aware timezone problem
diff --git a/planetstack/core/models/plcorebase.py b/planetstack/core/models/plcorebase.py
index 6b0a66b..5217667 100644
--- a/planetstack/core/models/plcorebase.py
+++ b/planetstack/core/models/plcorebase.py
@@ -1,3 +1,4 @@
+import datetime
import os
import sys
from django.db import models
@@ -62,11 +63,17 @@
return model_to_dict(self, fields=[field.name for field in
self._meta.fields])
+ def fields_differ(self,f1,f2):
+ if isinstance(f1,datetime.datetime) and isinstance(f2,datetime.datetime) and (timezone.is_aware(f1) != timezone.is_aware(f2)):
+ return True
+ else:
+ return (f1 != f2)
+
@property
def diff(self):
d1 = self._initial
d2 = self._dict
- diffs = [(k, (v, d2[k])) for k, v in d1.items() if v != d2[k]]
+ diffs = [(k, (v, d2[k])) for k, v in d1.items() if self.fields_differ(v,d2[k])]
return dict(diffs)
@property
@@ -114,11 +121,17 @@
return model_to_dict(self, fields=[field.name for field in
self._meta.fields])
+ def fields_differ(self,f1,f2):
+ if isinstance(f1,datetime.datetime) and isinstance(f2,datetime.datetime) and (timezone.is_aware(f1) != timezone.is_aware(f2)):
+ return True
+ else:
+ return (f1 != f2)
+
@property
def diff(self):
d1 = self._initial
d2 = self._dict
- diffs = [(k, (v, d2[k])) for k, v in d1.items() if v != d2[k]]
+ diffs = [(k, (v, d2[k])) for k, v in d1.items() if self.fields_differ(v,d2[k])]
return dict(diffs)
@property
diff --git a/planetstack/core/models/user.py b/planetstack/core/models/user.py
index c8df836..26a77f2 100644
--- a/planetstack/core/models/user.py
+++ b/planetstack/core/models/user.py
@@ -6,6 +6,7 @@
from django.forms.models import model_to_dict
from django.db import models
from django.db.models import F, Q
+from django.utils import timezone
from core.models import PlCoreBase,Site, DashboardView, DiffModelMixIn
from django.contrib.auth.models import AbstractBaseUser, BaseUserManager
from timezones.fields import TimeZoneField
@@ -92,11 +93,17 @@
return model_to_dict(self, fields=[field.name for field in
self._meta.fields])
+ def fields_differ(self,f1,f2):
+ if isinstance(f1,datetime.datetime) and isinstance(f2,datetime.datetime) and (timezone.is_aware(f1) != timezone.is_aware(f2)):
+ return True
+ else:
+ return (f1 != f2)
+
@property
def diff(self):
d1 = self._initial
d2 = self._dict
- diffs = [(k, (v, d2[k])) for k, v in d1.items() if v != d2[k]]
+ diffs = [(k, (v, d2[k])) for k, v in d1.items() if self.fields_differ(v,d2[k])]
return dict(diffs)
@property