feat: Add email verification, owner shift deletion, Coolify Docker compose setup, and fixes
This commit is contained in:
@@ -8,13 +8,14 @@ class User(AbstractUser):
|
||||
display_name = models.CharField(max_length=150, blank=True, default='')
|
||||
skills = models.ManyToManyField('events.Skill', blank=True, related_name='users')
|
||||
is_admin_user = models.BooleanField(default=False)
|
||||
is_approved = models.BooleanField(default=True, help_text="Vom Admin freigeschaltet")
|
||||
is_approved = models.BooleanField(default=False, help_text="Per Admin oder E-Mail-Bestätigung freigeschaltet")
|
||||
is_email_verified = models.BooleanField(default=False, help_text="E-Mail Bestätigungslink angeklickt")
|
||||
|
||||
def get_display_name(self):
|
||||
return self.display_name or self.username or self.email
|
||||
|
||||
def __str__(self):
|
||||
status_str = " (Ausstehend)" if not self.is_approved else ""
|
||||
status_str = " (Ausstehend)" if not (self.is_approved or self.is_email_verified) else ""
|
||||
return f"{self.get_display_name()} ({self.email}){status_str}"
|
||||
|
||||
class RegistrationDomainRule(models.Model):
|
||||
@@ -47,6 +48,15 @@ class RegistrationRestrictionSetting(models.Model):
|
||||
def __str__(self):
|
||||
return f"Domain-Einschränkung: {self.is_restriction_enabled}, Admin-Freischaltung: {self.require_admin_approval}"
|
||||
|
||||
class EmailVerificationToken(models.Model):
|
||||
token = models.UUIDField(default=uuid.uuid4, unique=True, editable=False)
|
||||
user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE, related_name='verification_tokens')
|
||||
is_used = models.BooleanField(default=False)
|
||||
created_at = models.DateTimeField(auto_now_add=True)
|
||||
|
||||
def __str__(self):
|
||||
return f"Verification Token for {self.user.username} ({self.token})"
|
||||
|
||||
class GuestClaimToken(models.Model):
|
||||
token = models.UUIDField(default=uuid.uuid4, unique=True, editable=False)
|
||||
signup = models.ForeignKey('events.ShiftSignup', on_delete=models.CASCADE, related_name='claim_tokens')
|
||||
|
||||
Reference in New Issue
Block a user