User add confirmed

pull/530/head
ibuler 8 years ago
parent c143735393
commit 0d3bde1191

@ -113,6 +113,8 @@ class User(AbstractUser):
private_key = models.CharField(max_length=5000, blank=True, verbose_name='ssh私钥') # ssh key max length 4096 bit
public_key = models.CharField(max_length=1000, blank=True, verbose_name='公钥')
comment = models.TextField(max_length=200, blank=True, verbose_name='描述')
confirmed = models.BooleanField(default=False)
date_confirmed = models.DateField(blank=True, null=True, verbose_name='确认时间')
date_expired = models.DateTimeField(default=date_expired_default, blank=True, null=True, verbose_name='有效期')
created_by = models.CharField(max_length=30, default='')

@ -18,7 +18,7 @@ from django.contrib.auth import authenticate, login, logout
from .models import User, UserGroup
from .forms import UserAddForm, UserUpdateForm, UserGroupForm, UserLoginForm
from .utils import AdminUserRequiredMixin
from .utils import AdminUserRequiredMixin, ssh_key_gen
logger = logging.getLogger('jumpserver.users.views')

Loading…
Cancel
Save