github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-08 18:59:47 +00:00
Code Issues Projects Releases Wiki Activity

[Change] 全部使用uuid作为主键

Browse Source
This commit is contained in:
ibuler
2017-11-23 14:08:01 +08:00
parent d80cbe270a
commit e7f38ec894
21 changed files with 102 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/users/models/user.py
View File

@@ -2,7 +2,7 @@
# -*- coding: utf-8 -*-
#
import os
import uuid
from collections import OrderedDict
from django.conf import settings
@@ -27,7 +27,7 @@ class User(AbstractUser):
('User', 'User'),
('App', 'Application')
)
id = models.UUIDField(default=uuid.uuid4, primary_key=True)
username = models.CharField(max_length=20, unique=True, verbose_name=_('Username'))
name = models.CharField(max_length=20, verbose_name=_('Name'))
email = models.EmailField(max_length=30, unique=True, verbose_name=_('Email'))
@@ -234,7 +234,7 @@ class User(AbstractUser):
self.set_password(new_password)
self.save()
def delete(self):
def delete(self, using=None, keep_parents=False):
if self.pk == 1 or self.username == 'admin':
return
return super(User, self).delete()
@@ -267,7 +267,7 @@ class User(AbstractUser):
email=forgery_py.internet.email_address(),
name=forgery_py.name.full_name(),
password=make_password(forgery_py.lorem_ipsum.word()),
role=choice(dict(User.ROLE_CHOICES).keys()),
role=choice(list(dict(User.ROLE_CHOICES).keys())),
wechat=forgery_py.internet.user_name(True),
comment=forgery_py.lorem_ipsum.sentence(),
created_by=choice(cls.objects.all()).username)