Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove expiry; confirmations should never expire. 

(imported from commit 093d8fa266c0ceeaff8c15257194d23a1ce90b61)
This commit is contained in:
Luke Faraone 2012-09-28 16:35:05 -04:00
parent 5531f188c7
commit ece9d64d34
2 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
confirmation/models.py
View File

@ -40,12 +40,11 @@ class ConfirmationManager(models.Manager):
confirmation = self.get(confirmation_key=confirmation_key) confirmation = self.get(confirmation_key=confirmation_key)
except self.model.DoesNotExist: except self.model.DoesNotExist:
return False return False
if not confirmation.key_expired(): obj = confirmation.content_object
obj = confirmation.content_object status_field = get_status_field(obj._meta.app_label, obj._meta.module_name)
status_field = get_status_field(obj._meta.app_label, obj._meta.module_name) setattr(obj, status_field, getattr(settings, 'STATUS_ACTIVE', 1))
setattr(obj, status_field, getattr(settings, 'STATUS_ACTIVE', 1)) obj.save()
obj.save() return obj
return obj
return False return False
def send_confirmation(self, obj, email_address): def send_confirmation(self, obj, email_address):
@ -75,11 +74,6 @@ class ConfirmationManager(models.Manager):
send_mail(subject, body, settings.DEFAULT_FROM_EMAIL, [email_address]) send_mail(subject, body, settings.DEFAULT_FROM_EMAIL, [email_address])
return self.create(content_object=obj, date_sent=datetime.datetime.now(), confirmation_key=confirmation_key) return self.create(content_object=obj, date_sent=datetime.datetime.now(), confirmation_key=confirmation_key)
def delete_expired_confirmations(self):
for confirmation in self.all():
if confirmation.key_expired():
confirmation.delete()
class Confirmation(models.Model): class Confirmation(models.Model):
content_type = models.ForeignKey(ContentType) content_type = models.ForeignKey(ContentType)
@ -96,8 +90,3 @@ class Confirmation(models.Model):
def __unicode__(self): def __unicode__(self):
return _('confirmation email for %s') % self.content_object return _('confirmation email for %s') % self.content_object
def key_expired(self):
expiration_date = self.date_sent + datetime.timedelta(days=getattr(settings, 'EMAIL_CONFIRMATION_DAYS', 10))
return expiration_date <= datetime.datetime.now()
key_expired.boolean = True

2
confirmation/settings.py
View File

@ -4,8 +4,6 @@
__revision__ = '$Id: settings.py 12 2008-11-23 19:38:52Z jarek.zgoda $' __revision__ = '$Id: settings.py 12 2008-11-23 19:38:52Z jarek.zgoda $'
EMAIL_CONFIRMATION_DAYS = 10
STATUS_ACTIVE = 1 STATUS_ACTIVE = 1
STATUS_FIELDS = { STATUS_FIELDS = {