From 5d605ff788815db0a11a5e672cb304d448cf4be3 Mon Sep 17 00:00:00 2001 From: Sapan Bhatia Date: Mon, 21 Jul 2014 20:08:04 -0400 Subject: [PATCH] Implement new mark/purge deletion for User Model --- planetstack/core/models/user.py | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/planetstack/core/models/user.py b/planetstack/core/models/user.py index 0272661..44e3f14 100644 --- a/planetstack/core/models/user.py +++ b/planetstack/core/models/user.py @@ -11,9 +11,6 @@ from operator import itemgetter, attrgetter # Create your models here. class UserManager(BaseUserManager): - def get_query_set(self): - return super(UserManager, self).get_query_set().filter(deleted=False) - def create_user(self, email, firstname, lastname, password=None): """ Creates and saves a User with the given email, date of @@ -47,6 +44,9 @@ class UserManager(BaseUserManager): user.save(using=self._db) return user +class DeletedUserManager(UserManager): + def get_query_set(self): + return super(UserManager, self).get_query_set().filter(deleted=True) class User(AbstractBaseUser): @@ -87,6 +87,7 @@ class User(AbstractBaseUser): dashboards = models.ManyToManyField('DashboardView', through='UserDashboardView', blank=True) objects = UserManager() + deleted_objects = DeletedUserManager() USERNAME_FIELD = 'email' REQUIRED_FIELDS = ['firstname', 'lastname'] @@ -102,6 +103,21 @@ class User(AbstractBaseUser): # The user is identified by their email address return self.email + def delete(self, *args, **kwds): + # so we have something to give the observer + purge = kwds.get('purge',False) + try: + purge = purge or observer_disabled + except NameError: + pass + + if (purge): + super(User, self).delete(*args, **kwds) + else: + self.deleted = True + self.enacted=None + self.save(update_fields=['enacted','deleted']) + @property def keyname(self): return self.email[:self.email.find('@')] -- 2.43.0