github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'dev' of github.com:jumpserver/jumpserver into dev

pull/4107/head
ibuler 2020-06-16 15:30:39 +08:00
parent 19e34270d1 afa515d570
commit 08904c2a9f
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
apps/users/migrations/0027_auto_20200616_1503.py Normal file
View File

@ -0,0 +1,18 @@
# Generated by Django 2.2.10 on 2020-06-16 07:03
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('users', '0026_auto_20200508_2105'),
]
operations = [
migrations.AlterField(
model_name='user',
name='source',
field=models.CharField(choices=[('local', 'Local'), ('ldap', 'LDAP/AD'), ('openid', 'OpenID'), ('radius', 'Radius'), ('cas', 'CAS')], default='local', max_length=30, verbose_name='Source'),
),
]

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

@ -507,7 +507,7 @@ class User(AuthMixin, TokenMixin, RoleMixin, MFAMixin, AbstractUser):
max_length=30, default='', blank=True, verbose_name=_('Created by') max_length=30, default='', blank=True, verbose_name=_('Created by')
) )
source = models.CharField( source = models.CharField(
max_length=30, default=SOURCE_LDAP, choices=SOURCE_CHOICES, max_length=30, default=SOURCE_LOCAL, choices=SOURCE_CHOICES,
verbose_name=_('Source') verbose_name=_('Source')
) )
date_password_last_updated = models.DateTimeField( date_password_last_updated = models.DateTimeField(