Merge branch 'release/v22.3.0'
This commit is contained in:
@@ -27,7 +27,7 @@ from django.contrib.admin.widgets import AdminDateWidget, AdminTimeWidget, Admin
|
||||
import os
|
||||
import json
|
||||
import ssl
|
||||
|
||||
import secrets
|
||||
|
||||
import re
|
||||
import pytz
|
||||
@@ -923,7 +923,18 @@ class CoachingGroup(models.Model):
|
||||
return Rower.objects.filter(mycoachgroup=self)
|
||||
|
||||
# Extension of User with rowing specific data
|
||||
class APIKey(models.Model):
|
||||
key = models.CharField(max_length=50, unique=True, default=secrets.token_urlsafe)
|
||||
user = models.ForeignKey('auth.User', on_delete=models.CASCADE)
|
||||
created_at = models.DateTimeField(auto_now_add=True)
|
||||
is_active = models.BooleanField(default=True)
|
||||
|
||||
def __str__(self):
|
||||
return f"{self.user.username}:{self.key}"
|
||||
|
||||
def regenerate_key(self):
|
||||
self.key = secrets.token_urlsafe()
|
||||
self.save()
|
||||
|
||||
class Rower(models.Model):
|
||||
adaptivetypes = mytypes.adaptivetypes
|
||||
|
||||
Reference in New Issue
Block a user