Apply ruff formatting and fix unused import linting errors
Remove unused imports flagged by ruff (F401), apply ruff format across all files, and restore members.signals side-effect import with noqa: F401 so the post_save signal that auto-creates Member profiles continues to fire. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -5,5 +5,4 @@ class MembersConfig(AppConfig):
|
||||
name = "members"
|
||||
|
||||
def ready(self):
|
||||
# noinspection PyUnusedImports
|
||||
import members.signals
|
||||
import members.signals # noqa: F401
|
||||
|
||||
@@ -8,10 +8,18 @@ class MemberFilter(django_filters.FilterSet):
|
||||
user__first_name = django_filters.CharFilter(field_name="user__first_name", label=_("First name"), lookup_expr="icontains")
|
||||
user__last_name = django_filters.CharFilter(field_name="user__last_name", label=_("Last name"), lookup_expr="icontains")
|
||||
license = django_filters.CharFilter(label=_("License"), lookup_expr="icontains")
|
||||
user__is_active = django_filters.TypedChoiceFilter( field_name='user__is_active', label=_("Active?"), initial="true", choices=( ('', 'All users'), ('true', 'Active users'), ('false', 'Inactive users'), ), coerce=lambda x: x.lower() == 'true' )
|
||||
|
||||
user__is_active = django_filters.TypedChoiceFilter(
|
||||
field_name="user__is_active",
|
||||
label=_("Active?"),
|
||||
initial="true",
|
||||
choices=(
|
||||
("", "All users"),
|
||||
("true", "Active users"),
|
||||
("false", "Inactive users"),
|
||||
),
|
||||
coerce=lambda x: x.lower() == "true",
|
||||
)
|
||||
|
||||
class Meta:
|
||||
model = Member
|
||||
fields = ["user__first_name", "user__last_name", "license", "user__is_active"]
|
||||
|
||||
|
||||
@@ -7,7 +7,6 @@ from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
initial = True
|
||||
|
||||
dependencies = [
|
||||
|
||||
@@ -4,7 +4,6 @@ from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
("members", "0001_initial"),
|
||||
]
|
||||
|
||||
@@ -5,7 +5,6 @@ from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
("members", "0002_member_family"),
|
||||
]
|
||||
@@ -29,8 +28,6 @@ class Migration(migrations.Migration):
|
||||
migrations.AlterField(
|
||||
model_name="member",
|
||||
name="family",
|
||||
field=models.ManyToManyField(
|
||||
blank=True, to="members.member", verbose_name="family"
|
||||
),
|
||||
field=models.ManyToManyField(blank=True, to="members.member", verbose_name="family"),
|
||||
),
|
||||
]
|
||||
|
||||
@@ -5,7 +5,6 @@ from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
("members", "0003_member_created_member_updated_alter_member_family"),
|
||||
]
|
||||
@@ -14,9 +13,7 @@ class Migration(migrations.Migration):
|
||||
migrations.AddField(
|
||||
model_name="member",
|
||||
name="access_token",
|
||||
field=models.CharField(
|
||||
blank=True, max_length=255, null=True, verbose_name="access token"
|
||||
),
|
||||
field=models.CharField(blank=True, max_length=255, null=True, verbose_name="access token"),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name="member",
|
||||
@@ -37,9 +34,7 @@ class Migration(migrations.Migration):
|
||||
migrations.AddField(
|
||||
model_name="member",
|
||||
name="license",
|
||||
field=models.CharField(
|
||||
blank=True, max_length=20, null=True, verbose_name="license"
|
||||
),
|
||||
field=models.CharField(blank=True, max_length=20, null=True, verbose_name="license"),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name="member",
|
||||
|
||||
@@ -4,7 +4,6 @@ from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
("members", "0004_member_access_token_member_birthday_and_more"),
|
||||
]
|
||||
@@ -17,8 +16,6 @@ class Migration(migrations.Migration):
|
||||
migrations.AddField(
|
||||
model_name="member",
|
||||
name="family_members",
|
||||
field=models.ManyToManyField(
|
||||
blank=True, to="members.member", verbose_name="family members"
|
||||
),
|
||||
field=models.ManyToManyField(blank=True, to="members.member", verbose_name="family members"),
|
||||
),
|
||||
]
|
||||
|
||||
@@ -4,15 +4,14 @@ from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('members', '0005_remove_member_family_member_family_members'),
|
||||
("members", "0005_remove_member_family_member_family_members"),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='member',
|
||||
name='notes',
|
||||
field=models.TextField(blank=True, null=True, verbose_name='notes'),
|
||||
model_name="member",
|
||||
name="notes",
|
||||
field=models.TextField(blank=True, null=True, verbose_name="notes"),
|
||||
),
|
||||
]
|
||||
|
||||
@@ -54,26 +54,19 @@ class Member(RulesModel):
|
||||
@classmethod
|
||||
def create(cls, first_name: str, last_name: str, email: str, password: Optional[str] = None, member: Optional["Member"] = None) -> "Member":
|
||||
"""Creates a new member based on the provided details"""
|
||||
|
||||
|
||||
if member is not None and member.pk is not None:
|
||||
member.user.first_name = first_name
|
||||
member.user.last_name = last_name
|
||||
member.user.email = email
|
||||
member.user.username = email
|
||||
|
||||
|
||||
if password is not None and password != "":
|
||||
member.user.set_password(password)
|
||||
|
||||
|
||||
else:
|
||||
# First check to see if a user already exists in the system
|
||||
user, created = get_user_model().objects.get_or_create(
|
||||
username=email,
|
||||
defaults={
|
||||
"first_name": first_name,
|
||||
"last_name": last_name,
|
||||
"email": email
|
||||
}
|
||||
)
|
||||
user, created = get_user_model().objects.get_or_create(username=email, defaults={"first_name": first_name, "last_name": last_name, "email": email})
|
||||
|
||||
if not created:
|
||||
user.first_name = first_name
|
||||
@@ -102,11 +95,11 @@ class Member(RulesModel):
|
||||
|
||||
user.set_password(password)
|
||||
member.user = user
|
||||
|
||||
|
||||
if not member.user.is_active:
|
||||
member.user.is_active = True
|
||||
|
||||
|
||||
member.user.save()
|
||||
member.save()
|
||||
|
||||
return member
|
||||
|
||||
return member
|
||||
|
||||
@@ -6,4 +6,4 @@ from django.contrib.auth.models import AbstractUser
|
||||
|
||||
@rules.predicate
|
||||
def is_member_manager(user: Optional[AbstractUser]) -> bool:
|
||||
return user.has_perm('members.member_manager')
|
||||
return user.has_perm("members.member_manager")
|
||||
|
||||
Reference in New Issue
Block a user