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

modify some issues

Browse Source
This commit is contained in:
ibuler
2016-08-14 00:40:21 +08:00
parent 8b8e391feb
commit 9303415b89
5 changed files with 85 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
apps/users/migrations/0001_initial.py
View File

@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.10 on 2016-08-09 17:23
# Generated by Django 1.10 on 2016-08-13 16:36
from __future__ import unicode_literals
import django.contrib.auth.models
@@ -32,28 +32,56 @@ class Migration(migrations.Migration):
('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')),
('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')),
('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')),
('avatar', models.ImageField(default='', upload_to=b'', verbose_name='\u5934\u50cf')),
('wechat', models.CharField(max_length=30, verbose_name='\u5fae\u4fe1')),
('phone', models.CharField(max_length=20, verbose_name='\u624b\u673a')),
('enable_2FA', models.BooleanField(default=False, verbose_name='\u542f\u7528\u4e8c\u6b21\u9a8c\u8bc1')),
('secret_key_2FA', models.CharField(max_length=16)),
('private_key', models.CharField(max_length=5000)),
('public_key', models.CharField(max_length=1000)),
('created_by', models.CharField(max_length=30)),
('date_expired', models.DateTimeField()),
],
options={
'abstract': False,
'verbose_name': 'user',
'verbose_name_plural': 'users',
'db_table': 'user',
},
managers=[
('objects', django.contrib.auth.models.UserManager()),
],
),
migrations.CreateModel(
name='Group',
name='Role',
fields=[
('group_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='auth.Group')),
('comment', models.CharField(blank=True, max_length=80)),
],
options={
'db_table': 'role',
},
bases=('auth.group',),
),
migrations.CreateModel(
name='UserGroup',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(help_text='\u8bf7\u8f93\u5165\u7ec4\u540d\u79f0', max_length=100, unique=True, verbose_name='\u7ec4\u540d\u79f0')),
('comment', models.TextField(blank=True, help_text='\u8bf7\u8f93\u5165\u7528\u6237\u7ec4\u63cf\u8ff0', verbose_name='\u63cf\u8ff0')),
('date_added', models.DateTimeField(auto_now_add=True)),
('created_by', models.CharField(max_length=100)),
],
options={
'db_table': 'usergroup',
},
),
migrations.AddField(
model_name='user',
name='groups',
field=models.ManyToManyField(to='users.Group'),
field=models.ManyToManyField(to='users.UserGroup'),
),
migrations.AddField(
model_name='user',
name='role',
field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='users.Role'),
),
migrations.AddField(
model_name='user',