Skip to content

J
jumpserver
Commit ac3553ba authored by ibuler's avatar ibuler
Browse files
Options

[Fixture] 修改asset detail

parent 97fb2a4f
Show whitespace changes
Inline Side-by-side
Showing with 55 additions and 19 deletions
apps/assets/models/__init__.py
View file @ ac3553ba
...@@ -6,3 +6,4 @@ from .idc import * ...@@ -6,3 +6,4 @@ from .idc import *
from .user import * from .user import *
from .group import * from .group import *
from .asset import * from .asset import *
from .utils import *
apps/assets/models/utils.py
View file @ ac3553ba
...@@ -2,19 +2,19 @@ ...@@ -2,19 +2,19 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# #
from . import IDC, SystemUser, AdminUser, AssetGroup, Asset, Tag from . import IDC, SystemUser, AdminUser, AssetGroup, Asset
__all__ = ['initial', 'generate_fake'] __all__ = ['init_model', 'generate_fake']
def initial(): def init_model():
for cls in [IDC, SystemUser, AdminUser, AssetGroup, Asset, Tag]: for cls in [IDC, SystemUser, AdminUser, AssetGroup, Asset]:
if hasattr(cls, 'initial'): if hasattr(cls, 'initial'):
cls.initial() cls.initial()
def generate_fake(): def generate_fake():
for cls in [IDC, SystemUser, AdminUser, AssetGroup, Asset, Tag]: for cls in [IDC, SystemUser, AdminUser, AssetGroup, Asset]:
if hasattr(cls, 'generate_fake'): if hasattr(cls, 'generate_fake'):
cls.generate_fake() cls.generate_fake()
......
apps/assets/templates/assets/asset_create.html
View file @ ac3553ba
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
{{ form.public_ip|bootstrap_horizontal }} {{ form.public_ip|bootstrap_horizontal }}
{{ form.port|bootstrap_horizontal }} {{ form.port|bootstrap_horizontal }}
{{ form.type|bootstrap_horizontal }} {{ form.type|bootstrap_horizontal }}
{{ form.env|bootstrap_horizontal }}
<div class="hr-line-dashed"></div> <div class="hr-line-dashed"></div>
<h3>{% trans 'Group' %}</h3> <h3>{% trans 'Group' %}</h3>
......
apps/assets/templates/assets/asset_detail.html
View file @ ac3553ba
...@@ -22,6 +22,11 @@ ...@@ -22,6 +22,11 @@
<li class="pull-right"> <li class="pull-right">
<a class="btn btn-outline btn-default" href="{% url 'assets:asset-update' pk=asset.id %}"><i class="fa fa-edit"></i>Update</a> <a class="btn btn-outline btn-default" href="{% url 'assets:asset-update' pk=asset.id %}"><i class="fa fa-edit"></i>Update</a>
</li> </li>
<li class="pull-right">
<a class="btn btn-outline btn-danger btn-delete-asset">
<i class="fa fa-edit"></i>Delete
</a>
</li>
{% endif %} {% endif %}
</ul> </ul>
</div> </div>
...@@ -55,6 +60,14 @@ ...@@ -55,6 +60,14 @@
<td>{% trans 'IP' %}:</td> <td>{% trans 'IP' %}:</td>
<td><b>{{ asset.ip }}</b></td> <td><b>{{ asset.ip }}</b></td>
</tr> </tr>
<tr>
<td>{% trans 'Public IP' %}:</td>
<td><b>{{ asset.public_ip }}</b></td>
</tr>
<tr>
<td>{% trans 'Port' %}:</td>
<td><b>{{ asset.port }}</b></td>
</tr>
<tr> <tr>
<td>{% trans 'Admin user' %}:</td> <td>{% trans 'Admin user' %}:</td>
{% if asset.admin_user %} {% if asset.admin_user %}
...@@ -63,25 +76,33 @@ ...@@ -63,25 +76,33 @@
<td><b>None</b></td> <td><b>None</b></td>
{% endif %} {% endif %}
</tr> </tr>
<tr>
<td>{% trans 'Other IP' %}:</td>
<td><b>{{ asset.other_ip }}</b></td>
</tr>
<tr> <tr>
<td>{% trans 'Remote card IP' %}:</td> <td>{% trans 'Remote card IP' %}:</td>
<td><b>{{ asset.remote_card_ip }}</b></td> <td><b>{{ asset.remote_card_ip }}</b></td>
</tr> </tr>
<tr> <tr>
<td>{% trans 'Port' %}:</td> <td>{% trans 'IDC' %}:</td>
<td><b>{{ asset.port }}</b></td> <td><b>{{ asset.idc.name }}</b></td>
</tr>
<tr>
<td>{% trans 'Cabinet no' %}:</td>
<td><b>{{ asset.cabinet_no }}</b></td>
</tr>
<tr>
<td>{% trans 'Cabinet pos' %}:</td>
<td><b>{{ asset.cabinet_pos }}</b></td>
</tr> </tr>
<tr> <tr>
<td>{% trans 'Mac address' %}:</td> <td>{% trans 'Vendor' %}:</td>
<td><b>{{ asset.mac_addr }}</b></td> <td><b>{{ asset.vendor }}</b></td>
</tr>
<tr>
<td>{% trans 'Model' %}:</td>
<td><b>{{ asset.model }}</b></td>
</tr> </tr>
<tr> <tr>
<td>{% trans 'CPU' %}:</td> <td>{% trans 'CPU' %}:</td>
<td><b>{{ asset.cpu }}</b></td> <td><b>{{ asset.cpu_model }} {{ asset.cpu_count }}*{{ asset.cpu_cores }}</b></td>
</tr> </tr>
<tr> <tr>
<td>{% trans 'Memory' %}:</td> <td>{% trans 'Memory' %}:</td>
...@@ -89,11 +110,15 @@ ...@@ -89,11 +110,15 @@
</tr> </tr>
<tr> <tr>
<td>{% trans 'Disk' %}:</td> <td>{% trans 'Disk' %}:</td>
<td><b>{{ asset.disk }}</b></td> <td><b>{{ asset.disk_total }}</b></td>
</tr>
<tr>
<td>{% trans 'Platform' %}:</td>
<td><b>{{ asset.platform }}</b></td>
</tr> </tr>
<tr> <tr>
<td>{% trans 'OS' %}:</td> <td>{% trans 'OS' %}:</td>
<td><b>{{ asset.os }}</b></td> <td><b>{{ asset.os }} {{ asset.os_version }} {{ asset.os_arch }}</b></td>
</tr> </tr>
<tr> <tr>
<td>{% trans 'Asset status' %}:</td> <td>{% trans 'Asset status' %}:</td>
...@@ -415,6 +440,13 @@ $(document).ready(function () { ...@@ -415,6 +440,13 @@ $(document).ready(function () {
}).get(); }).get();
updateAssetSystem(system_users) updateAssetSystem(system_users)
}).on('click', '.btn-delete-asset', function () {
var $this = $(this);
var name = "{{ asset.hostname }}";
var uid = "{{ asset.id }}";
var the_url = '{% url "api-assets:asset-detail" pk=99991937 %}'.replace('99991937', uid);
var redirect_url = "{% url 'assets:asset-list' %}";
objectDelete($this, name, the_url, redirect_url);
}) })
......
apps/assets/views.py
View file @ ac3553ba
...@@ -68,6 +68,7 @@ class AssetCreateView(AdminUserRequiredMixin, CreateView): ...@@ -68,6 +68,7 @@ class AssetCreateView(AdminUserRequiredMixin, CreateView):
def form_valid(self, form): def form_valid(self, form):
self.asset = asset = form.save() self.asset = asset = form.save()
asset.created_by = self.request.user.username or 'Admin' asset.created_by = self.request.user.username or 'Admin'
asset.date_created = timezone.now()
asset.save() asset.save()
return super(AssetCreateView, self).form_valid(form) return super(AssetCreateView, self).form_valid(form)
......
apps/fixtures/init.json
View file @ ac3553ba
[{"model": "users.usergroup", "pk": 1, "fields": {"is_discard": false, "discard_time": null, "name": "Default", "comment": "Default user group for all user", "date_created": "2016-11-25T06:50:28.410Z", "created_by": "System"}}, {"model": "assets.assetgroup", "pk": 1, "fields": {"name": "Default", "created_by": "", "date_created": "2016-11-25T06:50:28.627Z", "comment": "Default asset group", "system_users": []}}, {"model": "users.user", "pk": 1, "fields": {"password": "pbkdf2_sha256$30000$RwSpXYAYQGbQ$PADpsQmM+cO5Y/R1CVSx3qNV4EbGIm2k+iMBXUtwvNc=", "last_login": null, "first_name": "", "last_name": "", "is_active": true, "date_joined": "2016-11-25T06:50:28.412Z", "username": "admin", "name": "Administrator", "email": "admin@jumpserver.org", "role": "Admin", "avatar": "", "wechat": "", "phone": null, "enable_otp": false, "secret_key_otp": "", "_private_key": "", "_public_key": "", "comment": "Administrator is the super user of system", "is_first_login": false, "date_expired": "2086-11-08T06:50:28.412Z", "created_by": "System", "user_permissions": [], "groups": [1]}}] [{"model": "users.usergroup", "pk": 1, "fields": {"is_discard": false, "discard_time": null, "name": "Default", "comment": "Default user group", "date_created": "2017-04-04T01:59:21.128Z", "created_by": "System"}}, {"model": "assets.idc", "pk": 1, "fields": {"name": "Default", "bandwidth": "", "contact": "", "phone": "", "address": "", "intranet": "", "extranet": "", "date_created": "2017-04-04T01:59:21.140Z", "operator": "", "created_by": "System", "comment": "Default IDC"}}, {"model": "assets.assetgroup", "pk": 1, "fields": {"name": "Default", "created_by": "", "date_created": "2017-04-04T01:59:21.142Z", "comment": "Default asset group", "system_users": []}}, {"model": "users.user", "pk": 1, "fields": {"password": "pbkdf2_sha256$30000$f8HLJLRwydBR$M+X1huSgQOojfaG01SGNBYPOlbYnHHw/A4/RdcSBEQQ=", "last_login": null, "first_name": "", "last_name": "", "is_active": true, "date_joined": "2017-04-04T01:59:20.932Z", "username": "admin", "name": "Administrator", "email": "admin@jumpserver.org", "role": "Admin", "avatar": "", "wechat": "", "phone": null, "enable_otp": false, "secret_key_otp": "", "_private_key": "", "_public_key": "", "comment": "Administrator is the super user of system", "is_first_login": false, "date_expired": "2087-03-18T01:59:20.932Z", "created_by": "System", "user_permissions": [], "groups": [1]}}]
\ No newline at end of file \ No newline at end of file
apps/users/models/__init__.py
View file @ ac3553ba
...@@ -5,3 +5,4 @@ ...@@ -5,3 +5,4 @@
from .group import * from .group import *
from .user import * from .user import *
from .authentication import * from .authentication import *
from .utils import *
apps/users/models/utils.py
View file @ ac3553ba
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
from . import User, UserGroup from . import User, UserGroup
def initial_model(): def init_model():
for cls in [User, UserGroup]: for cls in [User, UserGroup]:
if getattr(cls, 'initial'): if getattr(cls, 'initial'):
cls.initial() cls.initial()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment