From ccb2f802fabf3ec425376427876a7a80defb5c0c Mon Sep 17 00:00:00 2001 From: Daniel Izquierdo Date: Tue, 28 Aug 2012 17:33:17 +0900 Subject: [PATCH 1/4] Change datetime.now to timezone.now --- logicaldelete/models.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/logicaldelete/models.py b/logicaldelete/models.py index d9a089a..cadff94 100644 --- a/logicaldelete/models.py +++ b/logicaldelete/models.py @@ -1,5 +1,5 @@ -from datetime import datetime from django.db import models +from django.utils import timezone class LogicalDeletedManager(models.Manager): @@ -38,7 +38,7 @@ def active(self): active.boolean = True def delete(self): - self.date_removed = datetime.now() + self.date_removed = timezone.now() self.save() class Meta: @@ -50,8 +50,8 @@ class AuditModel(models.Model): def save(self, *args, **kwargs): if not self.date_created: - self.date_created = datetime.now() - self.date_modified = datetime.now() + self.date_created = timezone.now() + self.date_modified = timezone.now() super(AuditModel, self).save(*args, **kwargs) class Meta: From 00baa21c7a97972b05f52fe4853ed687a7ae41a8 Mon Sep 17 00:00:00 2001 From: Daniel Izquierdo Date: Mon, 3 Sep 2012 11:11:00 +0900 Subject: [PATCH 2/4] Capitalize Django in the requirements --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index d3e4ba5..94a0e83 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ -django +Django From e47fb01eb1d1bb1f49ab639f68ab072ed767904f Mon Sep 17 00:00:00 2001 From: Omer Korner Date: Thu, 4 Jun 2015 09:38:04 +0300 Subject: [PATCH 3/4] Update usage to get_queryset --- logicaldelete/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/logicaldelete/models.py b/logicaldelete/models.py index cadff94..5ffcd2e 100644 --- a/logicaldelete/models.py +++ b/logicaldelete/models.py @@ -3,7 +3,7 @@ class LogicalDeletedManager(models.Manager): - def get_query_set(self): + def get_queryset(self): if self.model: return super(LogicalDeletedManager, self).get_query_set().filter(date_removed__isnull=True) From 1ff965a0b4802e99dbfe6007afea112fe37099db Mon Sep 17 00:00:00 2001 From: Omer Korner Date: Thu, 4 Jun 2015 09:39:06 +0300 Subject: [PATCH 4/4] Update more usage to get_queryset --- logicaldelete/models.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/logicaldelete/models.py b/logicaldelete/models.py index 5ffcd2e..1c9ab63 100644 --- a/logicaldelete/models.py +++ b/logicaldelete/models.py @@ -5,15 +5,15 @@ class LogicalDeletedManager(models.Manager): def get_queryset(self): if self.model: - return super(LogicalDeletedManager, self).get_query_set().filter(date_removed__isnull=True) + return super(LogicalDeletedManager, self).get_queryset().filter(date_removed__isnull=True) def everything(self): if self.model: - return super(LogicalDeletedManager, self).get_query_set() + return super(LogicalDeletedManager, self).get_queryset() def only_deleted(self): if self.model: - return super(LogicalDeletedManager, self).get_query_set().filter(date_removed__isnull=False) + return super(LogicalDeletedManager, self).get_queryset().filter(date_removed__isnull=False) def get(self, *args, **kwargs): ''' if a specific record was requested, return it even if it's deleted ''' @@ -23,7 +23,7 @@ def filter(self, *args, **kwargs): ''' if pk was specified as a kwarg, return even if it's deleted ''' if 'pk' in kwargs: return self.everything().filter(*args, **kwargs) - return self.get_query_set().filter(*args, **kwargs) + return self.get_queryset().filter(*args, **kwargs) class LogicalDeleteModel(models.Model):