login and auth bug fixed
This commit is contained in:
1 parent
89a5d70512
commit
7cd8ff0511
36 files changed
+632
-67
No files matched your search
@@ -1,15 +1,17 @@
|
||||
from django.db import models
|
||||
from utils.base_model import BaseModel
|
||||
import uuid
|
||||
from apps.cuser.models import CuserRole as CuserRoleModel
|
||||
from apps.cuser.models import CUser as CUserModel
|
||||
from django.contrib.auth import get_user_model
|
||||
from apps.cuser.cuser_model import CUser
|
||||
# Create your models here.
|
||||
#CUserM2 = get_user_model()
|
||||
|
||||
|
||||
class Workspace(BaseModel):
|
||||
cuser_role_owner = models.OneToOneField(CuserRoleModel, on_delete=models.CASCADE,
|
||||
related_name='workspace', null=True, blank=True)
|
||||
cuser_owner = models.ForeignKey(CUserModel, on_delete=models.CASCADE, null=True, blank=True, default=None)
|
||||
#cuser_role_owner = models.OneToOneField(CuserRoleModel, on_delete=models.CASCADE,
|
||||
# related_name='workspace', null=True, blank=True)
|
||||
|
||||
cuser_owner = models.ForeignKey(CUser, on_delete=models.SET_NULL, null=True, blank=True, default=None)
|
||||
name = models.CharField(max_length=15, null=False, blank=False)
|
||||
username = models.CharField(max_length=30, null=False, blank=False, unique=True)
|
||||
expire = models.DateTimeField(null=True, blank=True)
|
||||
|
||||
Reference in new issue
Block a user