upstream/2025.3.0 #3

Merged
simon merged 143 commits from upstream/2025.3.0 into master 2025-03-30 20:07:32 +00:00
2 changed files with 44 additions and 0 deletions
Showing only changes of commit 7da03ac17c - Show all commits
@@ -0,0 +1,41 @@
# Generated by Django 4.2.16 on 2025-02-28 13:25
from django.db import migrations, models
def remove_duplicates(apps, schema_editor):
UserKnownLoginSource = apps.get_model("pretixbase", "UserKnownLoginSource")
unique_fields = ["user", "agent_type", "device_type", "os_type", "country"]
duplicates = (
UserKnownLoginSource.objects
.values(*unique_fields)
.order_by()
.annotate(latest_id=models.Max('id'), count=models.Count('id'))
.filter(count__gt=1)
)
for duplicate in duplicates:
(
UserKnownLoginSource.objects
.filter(**{x: duplicate[x] for x in unique_fields})
.exclude(id=duplicate["latest_id"])
.delete()
)
class Migration(migrations.Migration):
dependencies = [
("pretixbase", "0277_customerssoclient_require_pkce_and_more"),
]
operations = [
migrations.RunPython(remove_duplicates, migrations.RunPython.noop),
migrations.AlterUniqueTogether(
name="userknownloginsource",
unique_together={
("user", "agent_type", "device_type", "os_type", "country")
},
),
]
+3
View File
@@ -602,6 +602,9 @@ class UserKnownLoginSource(models.Model):
country = FastCountryField(null=True, blank=True)
last_seen = models.DateTimeField()
class Meta:
unique_together = ('user', 'agent_type', 'device_type', 'os_type', 'country')
class StaffSession(models.Model):
user = models.ForeignKey('User', on_delete=models.PROTECT)