From c9d387244f83d8ae6dbc9ef97a59d6749979730f Mon Sep 17 00:00:00 2001 From: Fredrik Jonsson <frjo@xdeb.org> Date: Wed, 26 Feb 2020 11:17:09 +0100 Subject: [PATCH] Update user view index adter wagtail update. --- hypha/apply/users/admin_views.py | 2 +- .../users/management/commands/accounts_cleanup.py | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) delete mode 100644 opentech/apply/users/management/commands/accounts_cleanup.py diff --git a/hypha/apply/users/admin_views.py b/hypha/apply/users/admin_views.py index 643dfcf86..db680a7d9 100644 --- a/hypha/apply/users/admin_views.py +++ b/hypha/apply/users/admin_views.py @@ -4,8 +4,8 @@ from django.db.models import Q from django.shortcuts import render from django.utils.translation import ugettext as _ from django.views.decorators.vary import vary_on_headers +from wagtail.admin.auth import any_permission_required from wagtail.admin.forms.search import SearchForm -from wagtail.admin.utils import any_permission_required from wagtail.core.compat import AUTH_USER_APP_LABEL, AUTH_USER_MODEL_NAME User = get_user_model() diff --git a/opentech/apply/users/management/commands/accounts_cleanup.py b/opentech/apply/users/management/commands/accounts_cleanup.py deleted file mode 100644 index f95f037e9..000000000 --- a/opentech/apply/users/management/commands/accounts_cleanup.py +++ /dev/null @@ -1,15 +0,0 @@ -from django.contrib.auth import get_user_model -from django.core.management.base import BaseCommand -from django.db import transaction - - -class Command(BaseCommand): - help = "1. Mark all accounts that has not logged in after 3 month after creation as inactive. 2. Delete accounts that has never logged in and has no applications" - - @transaction.atomic - def handle(self, *args, **options): - User = get_user_model() - users = User.objects.filter(last_login__isnull=True, groups__isnull=True, applicationsubmission__isnull=True) - for user in users: - user.is_active = False - user.save() -- GitLab