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

Bugfix (#2938)

Browse Source 
* [Update] 修改assets

* [Update] 修复用户组页面权限

* [Update] 统一授权资产页面，修改apiUpdateAttr函数名称
This commit is contained in:
老广
2019-07-12 18:31:55 +08:00
committed by GitHub
parent e5bdceed58
commit 55b049c86a
49 changed files with 653 additions and 703 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/assets/models/base.py
View File

@@ -28,7 +28,7 @@ class AssetUser(OrgModelMixin):
name = models.CharField(max_length=128, verbose_name=_('Name'))
username = models.CharField(max_length=32, blank=True, verbose_name=_('Username'), validators=[alphanumeric])
password = fields.EncryptCharField(max_length=256, blank=True, null=True, verbose_name=_('Password'))
private_key = fields.EncryptTextField(blank=True, null=True, verbose_name=_('SSH private key'), validators=[private_key_validator, ])
private_key = fields.EncryptTextField(blank=True, null=True, verbose_name=_('SSH private key'))
public_key = fields.EncryptTextField(blank=True, null=True, verbose_name=_('SSH public key'))
comment = models.TextField(blank=True, verbose_name=_('Comment'))
date_created = models.DateTimeField(auto_now_add=True, verbose_name=_("Date created"))