Merge with user-perm

This commit is contained in:
ibuler
2016-09-17 19:15:14 +08:00
28 changed files with 899 additions and 203 deletions

View File

@@ -12,7 +12,7 @@ class AssetForm(forms.ModelForm):
fields = [
"ip", "other_ip", "remote_card_ip", "hostname", "port", "groups", "username", "password",
"idc", "mac_address", "brand", "cpu", "memory", "disk", "os", "cabinet_no", "cabinet_pos",
"number", "status", "type", "env", "sn", "is_active", "comment", "admin_user", "system_user"
"number", "status", "type", "env", "sn", "is_active", "comment", "admin_user", "system_users"
]
widgets = {