mirror of https://github.com/jumpserver/jumpserver
fix null
wangyong
parent
0e8e88fac0
commit
fa07f4ee8a
|
|
@ -10,7 +10,7 @@ class AssetForm(forms.ModelForm):
|
|||
model = Asset
|
||||
|
||||
fields = [
|
||||
"ip", "other_ip", "remote_card_ip", "hostname", "port", "group", "username", "password",
|
||||
"ip", "other_ip", "remote_card_ip", "hostname", "port", "groups", "username", "password",
|
||||
"idc", "mac_addr", "brand", "cpu", "memory", "disk", "os", "cabinet_no", "cabinet_pos",
|
||||
"number", "status", "type", "env", "sn", "is_active", "comment"
|
||||
]
|
||||
|
|
|
|||
|
|
@ -6,9 +6,9 @@ from django.utils.translation import ugettext_lazy as _
|
|||
|
||||
|
||||
class AssetGroup(models.Model):
|
||||
name = models.CharField(max_length=64, unique=True, verbose_name=_('Name'))
|
||||
created_by = models.CharField(max_length=32, blank=True, verbose_name=_('Created by'))
|
||||
comment = models.CharField(max_length=128, blank=True, verbose_name=_('Comment'))
|
||||
name = models.CharField(max_length=64, unique=True, null=True, blank=True, verbose_name=_('Name'))
|
||||
created_by = models.CharField(max_length=32, null=True, blank=True, verbose_name=_('Created by'))
|
||||
comment = models.CharField(max_length=128, null=True, blank=True, verbose_name=_('Comment'))
|
||||
|
||||
def __unicode__(self):
|
||||
return self.name
|
||||
|
|
@ -50,61 +50,6 @@ class AssetExtend(models.Model):
|
|||
db_table = 'assetextend'
|
||||
|
||||
|
||||
class Asset(models.Model):
|
||||
ip = models.CharField(max_length=32, blank=True, verbose_name=_('IP'))
|
||||
other_ip = models.CharField(max_length=255, blank=True, verbose_name=_('Other IP'))
|
||||
remote_card_ip = models.CharField(max_length=16, blank=True, verbose_name=_('Remote card IP'))
|
||||
hostname = models.CharField(max_length=128, unique=True, blank=True, verbose_name=_('Hostname'))
|
||||
port = models.IntegerField(blank=True, verbose_name=_('Port'))
|
||||
groups = models.ManyToManyField(AssetGroup, blank=True, verbose_name=_('Asset groups'))
|
||||
username = models.CharField(max_length=16, blank=True, verbose_name=_('Admin user'))
|
||||
password = models.CharField(max_length=256, blank=True, verbose_name=_("Admin password"))
|
||||
admin_user = models.ForeignKey(AdminUser, null=True, blank=True, on_delete=models.SET_NULL, verbose_name=_("Admin User"))
|
||||
sys_user = models.ManyToManyField(SysUser, null=True, blank=True, verbose_name=_("Sys User"))
|
||||
idc = models.ForeignKey(IDC, blank=True, null=True, on_delete=models.SET_NULL, verbose_name=_('IDC'))
|
||||
mac_addr = models.CharField(max_length=20, blank=True, verbose_name=_("Mac address"))
|
||||
brand = models.CharField(max_length=64, blank=True, verbose_name=_('Brand'))
|
||||
cpu = models.CharField(max_length=64, blank=True, verbose_name=_('CPU'))
|
||||
memory = models.CharField(max_length=128, blank=True, verbose_name=_('Memory'))
|
||||
disk = models.CharField(max_length=1024, blank=True, verbose_name=_('Disk'))
|
||||
os = models.CharField(max_length=128, blank=True, verbose_name=_('OS'))
|
||||
cabinet_no = models.CharField(max_length=32, blank=True, verbose_name=_('Cabinet number'))
|
||||
cabinet_pos = models.IntegerField(null=True, blank=True, verbose_name=_('Cabinet position'))
|
||||
number = models.CharField(max_length=32, blank=True, unique=True, verbose_name=_('Asset number'))
|
||||
status = models.ManyToManyField(AssetExtend, blank=True,
|
||||
related_name="asset_status_extend", verbose_name=_('Asset status'))
|
||||
type = models.ManyToManyField(AssetExtend, blank=True,
|
||||
related_name="asset_type_extend", verbose_name=_('Asset type'))
|
||||
env = models.ManyToManyField(AssetExtend, blank=True,
|
||||
related_name="asset_env_extend", verbose_name=_('Asset environment'))
|
||||
sn = models.CharField(max_length=128, blank=True, unique=True, verbose_name=_('Serial number'))
|
||||
created_by = models.CharField(max_length=32, blank=True, verbose_name=_('Created by'))
|
||||
is_active = models.BooleanField(default=True, verbose_name=_('Is active'))
|
||||
date_added = models.DateTimeField(auto_now=True, null=True, verbose_name=_('Date added'))
|
||||
comment = models.CharField(max_length=128, blank=True, verbose_name=_('Comment'))
|
||||
|
||||
def __unicode__(self):
|
||||
return self.ip
|
||||
|
||||
class Meta:
|
||||
db_table = 'asset'
|
||||
|
||||
|
||||
class Label(models.Model):
|
||||
key = models.CharField(max_length=64, null=True, blank=True, verbose_name=u'key')
|
||||
value = models.CharField(max_length=64, null=True, blank=True, verbose_name=u'value')
|
||||
asset = models.ForeignKey(Asset, null=True, blank=True, on_delete=models.SET_NULL, verbose_name=u'label')
|
||||
created_by = models.CharField(max_length=32, blank=True, verbose_name=_("Created by"))
|
||||
date_added = models.DateTimeField(auto_now=True, null=True, blank=True)
|
||||
comment = models.CharField(max_length=128, blank=True, verbose_name=_('Comment'))
|
||||
|
||||
def __unicode__(self):
|
||||
return self.name
|
||||
|
||||
class Meta:
|
||||
db_table = 'label'
|
||||
|
||||
|
||||
class AdminUser(models.Model):
|
||||
name = models.CharField(max_length=128, unique=True, null=True, blank=True, verbose_name=u"用户名称")
|
||||
username = models.CharField(max_length=16, null=True, blank=True, verbose_name=u"用户名")
|
||||
|
|
@ -147,3 +92,59 @@ class SysUser(models.Model):
|
|||
class Meta:
|
||||
db_table = 'sysuser'
|
||||
|
||||
|
||||
class Asset(models.Model):
|
||||
ip = models.CharField(max_length=32, null=True, blank=True, verbose_name=_('IP'))
|
||||
other_ip = models.CharField(max_length=255, null=True, blank=True, verbose_name=_('Other IP'))
|
||||
remote_card_ip = models.CharField(max_length=16, null=True, blank=True, verbose_name=_('Remote card IP'))
|
||||
hostname = models.CharField(max_length=128, unique=True, null=True, blank=True, verbose_name=_('Hostname'))
|
||||
port = models.IntegerField(null=True, blank=True, verbose_name=_('Port'))
|
||||
groups = models.ManyToManyField(AssetGroup, null=True, blank=True, verbose_name=_('Asset groups'))
|
||||
username = models.CharField(max_length=16, null=True, blank=True, verbose_name=_('Admin user'))
|
||||
password = models.CharField(max_length=256, null=True, blank=True, verbose_name=_("Admin password"))
|
||||
admin_user = models.ForeignKey(AdminUser, null=True, blank=True, on_delete=models.SET_NULL, verbose_name=_("Admin User"))
|
||||
sys_user = models.ManyToManyField(SysUser, null=True, blank=True, verbose_name=_("Sys User"))
|
||||
idc = models.ForeignKey(IDC, null=True, blank=True, on_delete=models.SET_NULL, verbose_name=_('IDC'))
|
||||
mac_addr = models.CharField(max_length=20, null=True, blank=True, verbose_name=_("Mac address"))
|
||||
brand = models.CharField(max_length=64, null=True, blank=True, verbose_name=_('Brand'))
|
||||
cpu = models.CharField(max_length=64, null=True, blank=True, verbose_name=_('CPU'))
|
||||
memory = models.CharField(max_length=128, null=True, blank=True, verbose_name=_('Memory'))
|
||||
disk = models.CharField(max_length=1024, null=True, blank=True, verbose_name=_('Disk'))
|
||||
os = models.CharField(max_length=128, null=True, blank=True, verbose_name=_('OS'))
|
||||
cabinet_no = models.CharField(max_length=32, null=True, blank=True, verbose_name=_('Cabinet number'))
|
||||
cabinet_pos = models.IntegerField(null=True, blank=True, verbose_name=_('Cabinet position'))
|
||||
number = models.CharField(max_length=32, null=True, blank=True, unique=True, verbose_name=_('Asset number'))
|
||||
status = models.ManyToManyField(AssetExtend, null=True, blank=True,
|
||||
related_name="asset_status_extend", verbose_name=_('Asset status'))
|
||||
type = models.ManyToManyField(AssetExtend, null=True, blank=True,
|
||||
related_name="asset_type_extend", verbose_name=_('Asset type'))
|
||||
env = models.ManyToManyField(AssetExtend, null=True, blank=True,
|
||||
related_name="asset_env_extend", verbose_name=_('Asset environment'))
|
||||
sn = models.CharField(max_length=128, null=True, blank=True, unique=True, verbose_name=_('Serial number'))
|
||||
created_by = models.CharField(max_length=32, null=True, blank=True, verbose_name=_('Created by'))
|
||||
is_active = models.BooleanField(default=True, verbose_name=_('Is active'))
|
||||
date_added = models.DateTimeField(auto_now=True, null=True, blank=True, verbose_name=_('Date added'))
|
||||
comment = models.CharField(max_length=128, null=True, blank=True, verbose_name=_('Comment'))
|
||||
|
||||
def __unicode__(self):
|
||||
return self.ip
|
||||
|
||||
class Meta:
|
||||
db_table = 'asset'
|
||||
|
||||
|
||||
class Label(models.Model):
|
||||
key = models.CharField(max_length=64, null=True, blank=True, verbose_name=u'key')
|
||||
value = models.CharField(max_length=64, null=True, blank=True, verbose_name=u'value')
|
||||
asset = models.ForeignKey(Asset, null=True, blank=True, on_delete=models.SET_NULL, verbose_name=u'label')
|
||||
created_by = models.CharField(max_length=32, blank=True, verbose_name=_("Created by"))
|
||||
date_added = models.DateTimeField(auto_now=True, null=True, blank=True)
|
||||
comment = models.CharField(max_length=128, blank=True, verbose_name=_('Comment'))
|
||||
|
||||
def __unicode__(self):
|
||||
return self.name
|
||||
|
||||
class Meta:
|
||||
db_table = 'label'
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,9 @@
|
|||
# coding:utf-8
|
||||
from __future__ import absolute_import, unicode_literals
|
||||
|
||||
from django.views.generic import TemplateView, ListView
|
||||
from django.urls import reverse_lazy
|
||||
from django.views.generic.edit import CreateView, DeleteView, FormView, UpdateView
|
||||
from __future__ import absolute_import, unicode_literals
|
||||
|
||||
from django.views.generic import TemplateView, ListView
|
||||
from django.views.generic.edit import CreateView, DeleteView, FormView, UpdateView
|
||||
|
|
|
|||
Loading…
Reference in New Issue