diff --git a/apps/perms/templates/perms/asset_permission_list.html b/apps/perms/templates/perms/asset_permission_list.html index 43bab6e70..07ccf75cf 100644 --- a/apps/perms/templates/perms/asset_permission_list.html +++ b/apps/perms/templates/perms/asset_permission_list.html @@ -7,7 +7,6 @@ {% endblock %} {% block table_head %} - {% trans 'ID' %} {% trans 'Name' %} {% trans 'User' %} {% trans 'User group' %} @@ -21,7 +20,6 @@ {% block table_body %} {% for asset_permission in asset_permission_list %} - {{ asset_permission.id }} {{ asset_permission.name }} diff --git a/apps/templates/_footer.html b/apps/templates/_footer.html index 95f0f82d3..909d95d1f 100644 --- a/apps/templates/_footer.html +++ b/apps/templates/_footer.html @@ -4,6 +4,6 @@
- Copyright Jumpserver.org Team © 2014-2017 + Copyright 北京堆栈科技有限公司 © 2014-2017
\ No newline at end of file diff --git a/apps/users/models/user.py b/apps/users/models/user.py index ba5b805a0..85cd9380b 100644 --- a/apps/users/models/user.py +++ b/apps/users/models/user.py @@ -43,8 +43,7 @@ class User(AbstractUser): _public_key = models.CharField(max_length=5000, blank=True, verbose_name=_('ssh public key')) comment = models.TextField(max_length=200, blank=True, verbose_name=_('Comment')) is_first_login = models.BooleanField(default=False) - date_expired = models.DateTimeField(default=date_expired_default, blank=True, null=True, - verbose_name=_('Date expired')) + date_expired = models.DateTimeField(default=date_expired_default, blank=True, null=True, verbose_name=_('Date expired')) created_by = models.CharField(max_length=30, default='', verbose_name=_('Created by')) @property