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

Add private token and change user group

Browse Source
This commit is contained in:
ibuler
2016-12-22 00:36:31 +08:00
parent 875aaa0029
commit 5b4ce709af
14 changed files with 109 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,7 +15,7 @@ from django.shortcuts import reverse
from rest_framework.authtoken.models import Token
from common.utils import signer, date_expired_default
from . import UserGroup, AccessKey
from . import UserGroup
__all__ = ['User']
@@ -178,11 +178,12 @@ class User(AbstractUser):
@classmethod
def create_app_user(cls, name, comment):
domain_name = settings.DOMAIN_NAME or 'jumpserver.org'
from . import AccessKey
domain_name = settings.CONFIG.DOMAIN_NAME or 'jumpserver.org'
app = cls.objects.create(username=name, name=name, email='%s@%s' % (name, domain_name),
role='App', enable_otp=False, comment=comment, is_first_login=False,
created_by='System')
AccessKey.object.create(user=app)
AccessKey.objects.create(user=app)
return app
@classmethod
@@ -207,7 +208,7 @@ class User(AbstractUser):
return super(User, self).delete()
class Meta:
db_table = 'user'
ordering = ['username']
#: Use this method initial user
@classmethod