renamed ACTIVATION_REQUIRED const to ACTIVATION

misago/admin/views/index.py

@@ -25,7 +25,7 @@ def admin_index(request):
         'posts': Post.objects.count(),
         'users': UserModel.objects.count(),
         'inactive_users': UserModel.objects.exclude(
-            requires_activation=UserModel.ACTIVATION_REQUIRED_NONE
+            requires_activation=UserModel.ACTIVATION_NONE
         ).count()
     }
 

misago/users/api/userendpoints/create.py

@@ -36,11 +36,11 @@ def create_endpoint(request):
     activation_kwargs = {}
     if settings.account_activation == 'user':
         activation_kwargs = {
-            'requires_activation': UserModel.ACTIVATION_REQUIRED_USER
+            'requires_activation': UserModel.ACTIVATION_USER
         }
     elif settings.account_activation == 'admin':
         activation_kwargs = {
-            'requires_activation': UserModel.ACTIVATION_REQUIRED_ADMIN
+            'requires_activation': UserModel.ACTIVATION_ADMIN
         }
 
     new_user = UserModel.objects.create_user(

misago/users/models/user.py

@@ -143,9 +143,9 @@ class UserManager(BaseUserManager):
 
 
 class User(AbstractBaseUser, PermissionsMixin):
-    ACTIVATION_REQUIRED_NONE = 0
-    ACTIVATION_REQUIRED_USER = 1
-    ACTIVATION_REQUIRED_ADMIN = 2
+    ACTIVATION_NONE = 0
+    ACTIVATION_USER = 1
+    ACTIVATION_ADMIN = 2
 
     SUBSCRIBE_NONE = 0
     SUBSCRIBE_NOTIFY = 1
@@ -191,7 +191,7 @@ class User(AbstractBaseUser, PermissionsMixin):
 
     rank = models.ForeignKey('Rank', null=True, blank=True, on_delete=models.deletion.PROTECT)
     title = models.CharField(max_length=255, null=True, blank=True)
-    requires_activation = models.PositiveIntegerField(default=ACTIVATION_REQUIRED_NONE)
+    requires_activation = models.PositiveIntegerField(default=ACTIVATION_NONE)
 
     is_staff = models.BooleanField(_('staff status'),
         default=False,
@@ -314,11 +314,11 @@ class User(AbstractBaseUser, PermissionsMixin):
 
     @property
     def requires_activation_by_admin(self):
-        return self.requires_activation == User.ACTIVATION_REQUIRED_ADMIN
+        return self.requires_activation == User.ACTIVATION_ADMIN
 
     @property
     def requires_activation_by_user(self):
-        return self.requires_activation == User.ACTIVATION_REQUIRED_USER
+        return self.requires_activation == User.ACTIVATION_USER
 
     @property
     def can_be_messaged_by_everyone(self):

misago/users/views/activation.py

@@ -65,7 +65,7 @@ def activate_by_token(request, pk, token):
                 'message': e.args[0],
             }, status=400)
 
-    inactive_user.requires_activation = User.ACTIVATION_REQUIRED_NONE
+    inactive_user.requires_activation = User.ACTIVATION_NONE
     inactive_user.save(update_fields=['requires_activation'])
 
     message = _("%(user)s, your account has been activated!")

misago/users/views/admin/users.py

@@ -108,7 +108,7 @@ class UsersList(UserAdmin, generic.ListView):
         else:
             activated_users_pks = [u.pk for u in inactive_users]
             queryset = User.objects.filter(pk__in=activated_users_pks)
-            queryset.update(requires_activation=User.ACTIVATION_REQUIRED_NONE)
+            queryset.update(requires_activation=User.ACTIVATION_NONE)
 
             subject = _("Your account on %(forum_name)s forums has been activated")
             mail_subject = subject % {