Code cleanup some small changes in the formatting.
This commit is contained in:
@@ -9,19 +9,26 @@ from easy_thumbnails import fields, widgets
|
||||
from membership.models import Membership, ActivationRequest
|
||||
|
||||
|
||||
def activate_user(modeladmin, request, queryset): # Ignore PyLintBear (W0613)
|
||||
"""Triggers activation of the selects actication requests by hand."""
|
||||
for activation in queryset:
|
||||
membership = Membership.objects.get(username=activation.user.username)
|
||||
membership.save()
|
||||
activation.activate()
|
||||
def activate_user(modeladmin, request, queryset):
|
||||
"""Triggers activation of the selects actication requests by hand.
|
||||
|
||||
:param modeladmin: The ModelAdmin that triggered this action.
|
||||
:param request: An HttpRequest representing the current request.
|
||||
:param queryset: A QuerySet containing the objects selected by the user.
|
||||
"""
|
||||
[activation.activate() for activation in queryset ]
|
||||
|
||||
|
||||
activate_user.short_description = _('Activate selected User')
|
||||
|
||||
|
||||
def cleanup_activation(modeladmin, request, queryset): # Ignore PyLintBear (W0613)
|
||||
"""Delete every selected activation request that has been expired."""
|
||||
"""Delete every selected activation request that has been expired.
|
||||
|
||||
:param modeladmin: The ModelAdmin that triggered this action.
|
||||
:param request: An HttpRequest representing the current request.
|
||||
:param queryset: A QuerySet containing the objects selected by the user.
|
||||
"""
|
||||
for activation in queryset:
|
||||
if activation.expired:
|
||||
activation.user.delete()
|
||||
|
||||
@@ -56,8 +56,8 @@ class ActivationManager(models.Manager):
|
||||
"""Creates a PendingActivation instance with an random activation key.
|
||||
@param user: the user that requests activation.
|
||||
"""
|
||||
salt = str(user.pk * random.random()) + \
|
||||
user.registration_date.isoformat()
|
||||
salt = str(user.pk * random.random())
|
||||
salt += user.registration_date.isoformat()
|
||||
activation_key = hashlib.sha1(salt.encode()).hexdigest()
|
||||
return self.create(user=user, activation_key=activation_key)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user