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

[Bugfix] 修复一些明显的bug

Browse Source
This commit is contained in:
ibuler
2017-12-21 11:31:13 +08:00
parent 5a92972120
commit 76df1de634
36 changed files with 302 additions and 389 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/assets/models/asset.py
View File

@@ -18,10 +18,6 @@ __all__ = ['Asset']
logger = logging.getLogger(__name__)
def get_default_cluster():
return Cluster.initial()
class Asset(models.Model):
# Todo: Move them to settings
STATUS_CHOICES = (
@@ -48,7 +44,7 @@ class Asset(models.Model):
hostname = models.CharField(max_length=128, unique=True, verbose_name=_('Hostname'))
port = models.IntegerField(default=22, verbose_name=_('Port'))
groups = models.ManyToManyField(AssetGroup, blank=True, related_name='assets', verbose_name=_('Asset groups'))
cluster = models.ForeignKey(Cluster, blank=True, null=True, related_name='assets', on_delete=models.SET_NULL, verbose_name=_('Cluster'),)
cluster = models.ForeignKey(Cluster, blank=True, null=True, related_name='assets', on_delete=models.SET_NULL, verbose_name=_('Cluster'))
is_active = models.BooleanField(default=True, verbose_name=_('Is active'))
type = models.CharField(choices=TYPE_CHOICES, max_length=16, blank=True, null=True, default='Server', verbose_name=_('Asset type'),)
env = models.CharField(choices=ENV_CHOICES, max_length=8, blank=True, null=True, default='Prod', verbose_name=_('Asset environment'),)