diff --git a/setup.py b/setup.py index 07724f1..3736c99 100644 --- a/setup.py +++ b/setup.py @@ -22,10 +22,11 @@ "Operating System :: OS Independent", "Topic :: Software Development" ], - zip_safe=True, + zip_safe=False, packages=[ 'useraudit', 'useraudit.migrations', + 'useraudit.management.commands', ], - include_package_date=True, + include_package_data=True, ) diff --git a/useraudit/management/commands/activate_user.py b/useraudit/management/commands/activate_user.py index c567201..d390b57 100644 --- a/useraudit/management/commands/activate_user.py +++ b/useraudit/management/commands/activate_user.py @@ -1,6 +1,7 @@ from django.core.management.base import BaseCommand, CommandError from django.contrib.auth import get_user_model from django.db import transaction +from useraudit.models import UserDeactivation class Command(BaseCommand): @@ -30,3 +31,4 @@ def _activate_user(self, user): return user.is_active = True user.save() + UserDeactivation.objects.filter(username=user.username).delete() diff --git a/useraudit/views.py b/useraudit/views.py index 414a338..94b8d42 100644 --- a/useraudit/views.py +++ b/useraudit/views.py @@ -4,7 +4,7 @@ from django.contrib.auth import get_user_model from django.urls import reverse -from .models import LoginAttemptLogger +from .models import LoginAttemptLogger, UserDeactivation from . import middleware @@ -24,6 +24,7 @@ def reactivate_user(request, user_id): user = _get_user(user_id) user.is_active = True user.save() + UserDeactivation.objects.filter(username=user.username).delete() login_attempt_logger.reset(user.username) return HttpResponseRedirect(reverse("admin:useraudit_loginattempt_changelist"))