Merge pull request #4134 from jumpserver/fix-mfa-1.5

Fix mfa 1.5

README.md

@@ -15,13 +15,29 @@ JumpServer 采纳分布式架构，支持多机房跨区域部署，支持横向
 
 ## 特色优势
 
-- 开源: 零门槛，线上快速获取和安装；
-- 分布式: 轻松支持大规模并发访问；
+- 开源: 零门槛，线上快速获取和安装, 修复版本视情况而定；
+, 修复版本视情况而定- 分布式: 轻松支持大规模并发访问；
 - 无插件: 仅需浏览器，极致的 Web Terminal 使用体验；
 - 多云支持: 一套系统，同时管理不同云上面的资产；
 - 云端存储: 审计录像云端存储，永不丢失；
 - 多租户: 一套系统，多个子公司和部门同时使用。
 
+## 版本说明
+
+自 v2.0.0 发布后， JumpServer 版本号命名将变更为：v大版本.功能版本.Bug修复版本。比如：
+
+```
+v2.0.1 是 v2.0.0 之后的Bug修复版本；
+v2.1.0 是 v2.0.0 之后的功能版本。
+```
+
+像其它优秀开源项目一样，JumpServer 每个月会发布一个功能版本，并同时维护 3 个功能版本。比如：
+
+```
+在 v2.4 发布前，我们会同时维护 v2.1、v2.2、v2.3；
+在 v2.4 发布后，我们会同时维护 v2.2、v2.3、v2.4；v2.1 会停止维护。
+```
+
 ## 功能列表
 
 <table>

apps/applications/api/remote_app.py

@@ -15,7 +15,7 @@ __all__ = [
 
 class RemoteAppViewSet(OrgBulkModelViewSet):
     model = RemoteApp
-    filter_fields = ('name',)
+    filter_fields = ('name', 'type', 'comment')
     search_fields = filter_fields
     permission_classes = (IsOrgAdmin,)
     serializer_class = RemoteAppSerializer

apps/applications/forms/__init__.py

@@ -1,2 +0,0 @@
-from .remote_app import *
-from .database_app import *

apps/applications/forms/database_app.py

@@ -1,26 +0,0 @@
-# coding: utf-8
-#
-
-
-from django import forms
-from django.utils.translation import ugettext_lazy as _
-
-from .. import models
-
-__all__ = ['DatabaseAppMySQLForm']
-
-
-class BaseDatabaseAppForm(forms.ModelForm):
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.fields['type'].widget.attrs['disabled'] = True
-
-    class Meta:
-        model = models.DatabaseApp
-        fields = [
-            'name', 'type', 'host', 'port', 'database', 'comment'
-        ]
-
-
-class DatabaseAppMySQLForm(BaseDatabaseAppForm):
-    pass

apps/applications/forms/remote_app.py

@@ -1,120 +0,0 @@
-#  coding: utf-8
-#
-
-from django.utils.translation import ugettext as _
-from django import forms
-
-from orgs.mixins.forms import OrgModelForm
-
-from ..models import RemoteApp
-
-
-__all__ = [
-    'RemoteAppChromeForm', 'RemoteAppMySQLWorkbenchForm',
-    'RemoteAppVMwareForm', 'RemoteAppCustomForm'
-]
-
-
-class BaseRemoteAppForm(OrgModelForm):
-    default_initial_data = {}
-
-    def __init__(self, *args, **kwargs):
-        # 过滤RDP资产和系统用户
-        super().__init__(*args, **kwargs)
-        field_asset = self.fields['asset']
-        field_asset.queryset = field_asset.queryset.has_protocol('rdp')
-        self.fields['type'].widget.attrs['disabled'] = True
-        self.fields.move_to_end('comment')
-        self.initial_default()
-
-    def initial_default(self):
-        for name, value in self.default_initial_data.items():
-            field = self.fields.get(name)
-            if not field:
-                continue
-            field.initial = value
-
-    class Meta:
-        model = RemoteApp
-        fields = [
-            'name', 'asset', 'type', 'path', 'comment'
-        ]
-        widgets = {
-            'asset': forms.Select(attrs={
-                'class': 'select2', 'data-placeholder': _('Asset')
-            }),
-        }
-
-
-class RemoteAppChromeForm(BaseRemoteAppForm):
-    default_initial_data = {
-        'path': r'C:\Program Files (x86)\Google\Chrome\Application\chrome.exe'
-    }
-
-    chrome_target = forms.CharField(
-        max_length=128, label=_('Target URL'), required=False
-    )
-    chrome_username = forms.CharField(
-        max_length=128, label=_('Login username'), required=False
-    )
-    chrome_password = forms.CharField(
-        widget=forms.PasswordInput, strip=True,
-        max_length=128, label=_('Login password'), required=False
-    )
-
-
-class RemoteAppMySQLWorkbenchForm(BaseRemoteAppForm):
-    default_initial_data = {
-        'path': r'C:\Program Files\MySQL\MySQL Workbench 8.0 CE'
-                r'\MySQLWorkbench.exe'
-    }
-
-    mysql_workbench_ip = forms.CharField(
-        max_length=128, label=_('Database IP'), required=False
-    )
-    mysql_workbench_name = forms.CharField(
-        max_length=128, label=_('Database name'), required=False
-    )
-    mysql_workbench_username = forms.CharField(
-        max_length=128, label=_('Database username'), required=False
-    )
-    mysql_workbench_password = forms.CharField(
-        widget=forms.PasswordInput, strip=True,
-        max_length=128, label=_('Database password'), required=False
-    )
-
-
-class RemoteAppVMwareForm(BaseRemoteAppForm):
-    default_initial_data = {
-        'path': r'C:\Program Files (x86)\VMware\Infrastructure'
-                r'\Virtual Infrastructure Client\Launcher\VpxClient.exe'
-    }
-
-    vmware_target = forms.CharField(
-        max_length=128, label=_('Target address'), required=False
-    )
-    vmware_username = forms.CharField(
-        max_length=128, label=_('Login username'), required=False
-    )
-    vmware_password = forms.CharField(
-        widget=forms.PasswordInput, strip=True,
-        max_length=128, label=_('Login password'), required=False
-    )
-
-
-class RemoteAppCustomForm(BaseRemoteAppForm):
-
-    custom_cmdline = forms.CharField(
-        max_length=128, label=_('Operating parameter'), required=False
-    )
-    custom_target = forms.CharField(
-        max_length=128, label=_('Target address'), required=False
-    )
-    custom_username = forms.CharField(
-        max_length=128, label=_('Login username'), required=False
-    )
-    custom_password = forms.CharField(
-        widget=forms.PasswordInput, strip=True,
-        max_length=128, label=_('Login password'), required=False
-    )
-

apps/applications/templates/applications/database_app_create_update.html

@@ -1,55 +0,0 @@
-{% extends '_base_create_update.html' %}
-{% load static %}
-{% load bootstrap3 %}
-{% load i18n %}
-
-{% block form %}
-    <form id="DatabaseAppForm" method="post" class="form-horizontal">
-        {% bootstrap_form form layout="horizontal" %}
-        <div class="hr-line-dashed"></div>
-        <div class="form-group">
-            <div class="col-sm-4 col-sm-offset-2">
-                <button class="btn btn-default" type="reset"> {% trans 'Reset' %}</button>
-                <button id="submit_button" class="btn btn-primary" type="submit">{% trans 'Submit' %}</button>
-            </div>
-        </div>
-    </form>
-{% endblock %}
-
-{% block custom_foot_js %}
-<script type="text/javascript">
-var app_type_id = '#' + '{{ form.type.id_for_label }}';
-
-function getFormDataType(){
-    return $(app_type_id+ " option:selected").val();
-}
-function getFormData(form){
-    var data = form.serializeObject();
-    data['type'] = getFormDataType();
-    return data
-}
-
-$(document).ready(function () {
-})
-.on("submit", "form", function (evt) {
-    evt.preventDefault();
-    var the_url = '{% url "api-applications:database-app-list" %}';
-    var redirect_to = '{% url "applications:database-app-list" %}';
-    var method = "POST";
-    {% if api_action == "update" %}
-        the_url = '{% url "api-applications:database-app-detail" object.id %}';
-        method = "PUT";
-    {% endif %}
-    var form = $("form");
-    var data = getFormData(form);
-    var props = {
-        url: the_url,
-        data: data,
-        method: method,
-        form: form,
-        redirect_to: redirect_to
-    };
-    formSubmit(props);
-});
-</script>
-{% endblock %}

apps/applications/templates/applications/database_app_detail.html

@@ -1,103 +0,0 @@
-{% extends 'base.html' %}
-{% load static %}
-{% load i18n %}
-
-{% block content %}
-    <div class="wrapper wrapper-content animated fadeInRight">
-        <div class="row">
-            <div class="col-sm-12">
-                <div class="ibox float-e-margins">
-                    <div class="panel-options">
-                        <ul class="nav nav-tabs">
-                            <li class="active">
-                                <a href="{% url 'applications:database-app-detail' pk=database_app.id %}" class="text-center"><i class="fa fa-laptop"></i> {% trans 'Detail' %} </a>
-                            </li>
-                            <li class="pull-right">
-                                <a class="btn btn-outline btn-default" href="{% url 'applications:database-app-update' pk=database_app.id %}"><i class="fa fa-edit"></i>{% trans 'Update' %}</a>
-                            </li>
-                            <li class="pull-right">
-                                <a class="btn btn-outline btn-danger btn-delete-application">
-                                    <i class="fa fa-trash-o"></i>{% trans 'Delete' %}
-                                </a>
-                            </li>
-                        </ul>
-                    </div>
-                    <div class="tab-content">
-                        <div class="col-sm-8" style="padding-left: 0;">
-                            <div class="ibox float-e-margins">
-                                <div class="ibox-title">
-                                    <span class="label"><b>{{ database_app.name }}</b></span>
-                                    <div class="ibox-tools">
-                                        <a class="collapse-link">
-                                            <i class="fa fa-chevron-up"></i>
-                                        </a>
-                                        <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-                                            <i class="fa fa-wrench"></i>
-                                        </a>
-                                        <ul class="dropdown-menu dropdown-user">
-                                        </ul>
-                                        <a class="close-link">
-                                            <i class="fa fa-times"></i>
-                                        </a>
-                                    </div>
-                                </div>
-                                <div class="ibox-content">
-                                    <table class="table">
-                                        <tbody>
-                                        <tr class="no-borders-tr">
-                                            <td>{% trans 'Name' %}:</td>
-                                            <td><b>{{ database_app.name }}</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{% trans 'Type' %}:</td>
-                                            <td><b>{{ database_app.get_type_display }}</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{% trans 'Host' %}:</td>
-                                            <td><b>{{ database_app.host }}</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{% trans 'Port' %}:</td>
-                                            <td><b>{{ database_app.port }}</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{% trans 'Database' %}:</td>
-                                            <td><b>{{ database_app.database }}</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{% trans 'Date created' %}:</td>
-                                            <td><b>{{ database_app.date_created }}</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{% trans 'Created by' %}:</td>
-                                            <td><b>{{ database_app.created_by  }}</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{% trans 'Comment' %}:</td>
-                                            <td><b>{{ database_app.comment }}</b></td>
-                                        </tr>
-                                        </tbody>
-                                    </table>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-{% endblock %}
-{% block custom_foot_js %}
-<script>
-$(document).ready(function () {
-})
-.on('click', '.btn-delete-application', function () {
-    var $this = $(this);
-    var name = "{{ database_app.name }}";
-    var rid = "{{ database_app.id }}";
-    var the_url = '{% url "api-applications:database-app-detail" pk=DEFAULT_PK %}'.replace('{{ DEFAULT_PK }}', rid);
-    var redirect_url = "{% url 'applications:database-app-list' %}";
-    objectDelete($this, name, the_url, redirect_url);
-})
-</script>
-{% endblock %}

apps/applications/templates/applications/database_app_list.html

@@ -1,88 +0,0 @@
-{% extends '_base_list.html' %}
-{% load i18n static %}
-{% block help_message %}
-{% endblock %}
-{% block table_search %}{% endblock %}
-{% block table_container %}
-    <div class="btn-group uc pull-left m-r-5">
-        <button data-toggle="dropdown" class="btn btn-primary btn-sm dropdown-toggle">
-            {% trans "Create DatabaseApp" %}
-            <span class="caret"></span></button>
-        <ul class="dropdown-menu">
-            {% for key, value in type_choices %}
-                <li><a class="" href="{% url 'applications:database-app-create' %}?type={{ key }}">{{ value }}</a></li>
-            {% endfor %}
-        </ul>
-    </div>
-    <table class="table table-striped table-bordered table-hover " id="database_app_list_table" >
-        <thead>
-        <tr>
-            <th class="text-center">
-                <input type="checkbox" id="check_all" class="ipt_check_all" >
-            </th>
-            <th class="text-center">{% trans 'Name' %}</th>
-            <th class="text-center">{% trans 'Type' %}</th>
-            <th class="text-center">{% trans 'Host' %}</th>
-            <th class="text-center">{% trans 'Port' %}</th>
-            <th class="text-center">{% trans 'Database' %}</th>
-            <th class="text-center">{% trans 'Comment' %}</th>
-            <th class="text-center">{% trans 'Action' %}</th>
-        </tr>
-        </thead>
-        <tbody>
-        </tbody>
-    </table>
-{% endblock %}
-{% block content_bottom_left %}{% endblock %}
-{% block custom_foot_js %}
-<script>
-function initTable() {
-    var options = {
-        ele: $('#database_app_list_table'),
-        columnDefs: [
-            {targets: 1, createdCell: function (td, cellData, rowData) {
-                    cellData = htmlEscape(cellData);
-                    {% url 'applications:database-app-detail' pk=DEFAULT_PK as the_url  %}
-                    var detail_btn = '<a href="{{ the_url }}">' + cellData + '</a>';
-                    $(td).html(detail_btn.replace('{{ DEFAULT_PK }}', rowData.id));
-                }},
-            {targets: 2, createdCell: function (td, cellData, rowData) {
-                    $(td).html(rowData.get_type_display)
-                }},
-            {targets: 7, createdCell: function (td, cellData, rowData) {
-                    var update_btn = '<a href="{% url "applications:database-app-update" pk=DEFAULT_PK %}" class="btn btn-xs btn-info">{% trans "Update" %}</a>'.replace("{{ DEFAULT_PK }}", cellData);
-                    var del_btn = '<a class="btn btn-xs btn-danger m-l-xs btn-delete" data-rid="{{ DEFAULT_PK }}">{% trans "Delete" %}</a>'.replace('{{ DEFAULT_PK }}', cellData);
-                    $(td).html(update_btn + del_btn)
-                }}
-        ],
-        ajax_url: '{% url "api-applications:database-app-list" %}',
-        columns: [
-            {data: "id"},
-            {data: "name" },
-            {data: "type"},
-            {data: "host"},
-            {data: "port"},
-            {data: "database"},
-            {data: "comment"},
-            {data: "id", orderable: false, width: "120px"}
-        ],
-        op_html: $('#actions').html()
-    };
-    jumpserver.initServerSideDataTable(options);
-}
-$(document).ready(function(){
-    initTable();
-})
-.on('click', '.btn-delete', function () {
-    var $this = $(this);
-    var $data_table = $('#database_app_list_table').DataTable();
-    var name = $(this).closest("tr").find(":nth-child(2)").children('a').html();
-    var rid = $this.data('rid');
-    var the_url = '{% url "api-applications:database-app-detail" pk=DEFAULT_PK %}'.replace('{{ DEFAULT_PK }}', rid);
-    objectDelete($this, name, the_url);
-    setTimeout( function () {
-        $data_table.ajax.reload();
-    }, 3000);
-});
-</script>
-{% endblock %}

apps/applications/templates/applications/remote_app_create_update.html

@@ -1,71 +0,0 @@
-{% extends '_base_create_update.html' %}
-{% load static %}
-{% load bootstrap3 %}
-{% load i18n %}
-
-{% block form %}
-    <form id="RemoteAppForm" method="post" class="form-horizontal">
-        {% bootstrap_form form layout="horizontal" %}
-        <div class="hr-line-dashed"></div>
-        <div class="form-group">
-            <div class="col-sm-4 col-sm-offset-2">
-                <button class="btn btn-default" type="reset"> {% trans 'Reset' %}</button>
-
-                <button id="submit_button" class="btn btn-primary" type="submit">{% trans 'Submit' %}</button>
-            </div>
-        </div>
-    </form>
-{% endblock %}
-
-{% block custom_foot_js %}
-<script type="text/javascript">
-var app_type_id = '#' + '{{ form.type.id_for_label }}';
-
-function getFormDataType(){
-    return $(app_type_id+ " option:selected").val();
-}
-function constructFormDataParams(data){
-    var params = {};
-    var type =data.type;
-    for (var k in data){
-        if (k.startsWith(type)){
-            params[k] = data[k];
-            delete data[k]
-        }
-    }
-    return params
-}
-function getFormData(form){
-    var data = form.serializeObject();
-    data['type'] = getFormDataType();
-    data['params'] = constructFormDataParams(data);
-    return data
-}
-
-$(document).ready(function () {
-    $('.select2').select2({
-        closeOnSelect: true
-    });
-}).on("submit", "form", function (evt) {
-    evt.preventDefault();
-    var the_url = '{% url "api-applications:remote-app-list" %}';
-    var redirect_to = '{% url "applications:remote-app-list" %}';
-    var method = "POST";
-    {% if api_action == "update" %}
-        the_url = '{% url "api-applications:remote-app-detail" object.id %}';
-        method = "PUT";
-    {% endif %}
-    var form = $("form");
-    var data = getFormData(form);
-    var props = {
-        url: the_url,
-        data: data,
-        method: method,
-        form: form,
-        redirect_to: redirect_to
-     };
-    formSubmit(props);
- })
-;
-</script>
-{% endblock %}

apps/applications/templates/applications/remote_app_detail.html

@@ -1,100 +0,0 @@
-{% extends 'base.html' %}
-{% load static %}
-{% load i18n %}
-
-{% block content %}
-    <div class="wrapper wrapper-content animated fadeInRight">
-        <div class="row">
-            <div class="col-sm-12">
-                <div class="ibox float-e-margins">
-                    <div class="panel-options">
-                        <ul class="nav nav-tabs">
-                            <li class="active">
-                                <a href="{% url 'applications:remote-app-detail' pk=remote_app.id %}" class="text-center"><i class="fa fa-laptop"></i> {% trans 'Detail' %} </a>
-                            </li>
-                            <li class="pull-right">
-                                <a class="btn btn-outline btn-default" href="{% url 'applications:remote-app-update' pk=remote_app.id %}"><i class="fa fa-edit"></i>{% trans 'Update' %}</a>
-                            </li>
-                            <li class="pull-right">
-                                <a class="btn btn-outline btn-danger btn-delete-application">
-                                    <i class="fa fa-trash-o"></i>{% trans 'Delete' %}
-                                </a>
-                            </li>
-                        </ul>
-                    </div>
-                    <div class="tab-content">
-                        <div class="col-sm-8" style="padding-left: 0;">
-                            <div class="ibox float-e-margins">
-                                <div class="ibox-title">
-                                    <span class="label"><b>{{ remote_app.name }}</b></span>
-                                    <div class="ibox-tools">
-                                        <a class="collapse-link">
-                                            <i class="fa fa-chevron-up"></i>
-                                        </a>
-                                        <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-                                            <i class="fa fa-wrench"></i>
-                                        </a>
-                                        <ul class="dropdown-menu dropdown-user">
-                                        </ul>
-                                        <a class="close-link">
-                                            <i class="fa fa-times"></i>
-                                        </a>
-                                    </div>
-                                </div>
-                                <div class="ibox-content">
-                                    <table class="table">
-                                        <tbody>
-                                        <tr class="no-borders-tr">
-                                            <td>{% trans 'Name' %}:</td>
-                                            <td><b>{{ remote_app.name }}</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{% trans 'Asset' %}:</td>
-                                            <td><b><a href="{% url 'assets:asset-detail' pk=remote_app.asset.id %}">{{ remote_app.asset.hostname }}</a></b></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{% trans 'App type' %}:</td>
-                                            <td><b>{{ remote_app.get_type_display }}</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{% trans 'App path' %}:</td>
-                                            <td><b>{{ remote_app.path }}</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{% trans 'Date created' %}:</td>
-                                            <td><b>{{ remote_app.date_created }}</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{% trans 'Created by' %}:</td>
-                                            <td><b>{{ remote_app.created_by  }}</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{% trans 'Comment' %}:</td>
-                                            <td><b>{{ remote_app.comment }}</b></td>
-                                        </tr>
-                                        </tbody>
-                                    </table>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-{% endblock %}
-{% block custom_foot_js %}
-<script>
-jumpserver.nodes_selected = {};
-$(document).ready(function () {
-})
-.on('click', '.btn-delete-application', function () {
-    var $this = $(this);
-    var name = "{{ remote_app.name }}";
-    var rid = "{{ remote_app.id }}";
-    var the_url = '{% url "api-applications:remote-app-detail" pk=DEFAULT_PK %}'.replace('{{ DEFAULT_PK }}', rid);
-    var redirect_url = "{% url 'applications:remote-app-list' %}";
-    objectDelete($this, name, the_url, redirect_url);
-})
-</script>
-{% endblock %}

apps/applications/templates/applications/remote_app_list.html

@@ -1,92 +0,0 @@
-{% extends '_base_list.html' %}
-{% load i18n static %}
-{% block help_message %}
-    {% trans 'Before using this feature, make sure that the application loader has been uploaded to the application server and successfully published as a RemoteApp application' %}
-    <b><a href="https://github.com/jumpserver/Jmservisor/releases" target="view_window" >{% trans 'Download application loader' %}</a></b>
-{% endblock %}
-{% block table_search %}{% endblock %}
-{% block table_container %}
-    <div class="btn-group uc pull-left m-r-5">
-        <button data-toggle="dropdown" class="btn btn-primary btn-sm dropdown-toggle">
-            {% trans "Create RemoteApp" %}
-            <span class="caret"></span></button>
-        <ul class="dropdown-menu">
-            {% for key, value in type_choices %}
-                <li><a class="" href="{% url 'applications:remote-app-create' %}?type={{ key }}">{{ value }}</a></li>
-            {% endfor %}
-        </ul>
-    </div>
-    <table class="table table-striped table-bordered table-hover " id="remote_app_list_table" >
-        <thead>
-        <tr>
-            <th class="text-center">
-                <input type="checkbox" id="check_all" class="ipt_check_all" >
-            </th>
-            <th class="text-center">{% trans 'Name' %}</th>
-            <th class="text-center">{% trans 'App type' %}</th>
-            <th class="text-center">{% trans 'Asset' %}</th>
-            <th class="text-center">{% trans 'Comment' %}</th>
-            <th class="text-center">{% trans 'Action' %}</th>
-        </tr>
-        </thead>
-        <tbody>
-        </tbody>
-    </table>
-{% endblock %}
-{% block content_bottom_left %}{% endblock %}
-{% block custom_foot_js %}
-<script>
-function initTable() {
-    var options = {
-        ele: $('#remote_app_list_table'),
-        columnDefs: [
-            {targets: 1, createdCell: function (td, cellData, rowData) {
-                    cellData = htmlEscape(cellData);
-                    {% url 'applications:remote-app-detail' pk=DEFAULT_PK as the_url  %}
-                    var detail_btn = '<a href="{{ the_url }}">' + cellData + '</a>';
-                    $(td).html(detail_btn.replace('{{ DEFAULT_PK }}', rowData.id));
-                }},
-            {targets: 3, createdCell: function (td, cellData, rowData) {
-                    var hostname = htmlEscape(cellData.hostname);
-                    var detail_btn = '<a href="{% url 'assets:asset-detail' pk=DEFAULT_PK %}">' + hostname + '</a>';
-                    $(td).html(detail_btn.replace('{{ DEFAULT_PK }}', cellData.id));
-                }},
-            {targets: 3, createdCell: function (td, cellData, rowData) {
-                    var comment = htmlEscape(cellData);
-                    $(td).html(comment)
-                }},
-            {targets: 5, createdCell: function (td, cellData, rowData) {
-                    var update_btn = '<a href="{% url "applications:remote-app-update" pk=DEFAULT_PK %}" class="btn btn-xs btn-info">{% trans "Update" %}</a>'.replace("{{ DEFAULT_PK }}", cellData);
-                    var del_btn = '<a class="btn btn-xs btn-danger m-l-xs btn-delete" data-rid="{{ DEFAULT_PK }}">{% trans "Delete" %}</a>'.replace('{{ DEFAULT_PK }}', cellData);
-                    $(td).html(update_btn + del_btn)
-                }}
-        ],
-        ajax_url: '{% url "api-applications:remote-app-list" %}',
-        columns: [
-            {data: "id"},
-            {data: "name" },
-            {data: "get_type_display", orderable: false},
-            {data: "asset_info", orderable: false},
-            {data: "comment"},
-            {data: "id", orderable: false, width: "120px"}
-        ],
-        op_html: $('#actions').html()
-    };
-    jumpserver.initServerSideDataTable(options);
-}
-$(document).ready(function(){
-    initTable();
-})
-.on('click', '.btn-delete', function () {
-    var $this = $(this);
-    var $data_table = $('#remote_app_list_table').DataTable();
-    var name = $(this).closest("tr").find(":nth-child(2)").children('a').html();
-    var rid = $this.data('rid');
-    var the_url = '{% url "api-applications:remote-app-detail" pk=DEFAULT_PK %}'.replace('{{ DEFAULT_PK }}', rid);
-    objectDelete($this, name, the_url);
-    setTimeout( function () {
-        $data_table.ajax.reload();
-    }, 3000);
-});
-</script>
-{% endblock %}

apps/applications/templates/applications/user_database_app_list.html

@@ -1,83 +0,0 @@
-{% extends 'base.html' %}
-{% load i18n static %}
-
-{% block custom_head_css_js %}
-    <script src="{% static 'js/jquery.form.min.js' %}"></script>
-{% endblock %}
-
-{% block content %}
-<div class="mail-box-header">
-    <table class="table table-striped table-bordered table-hover " id="database_app_list_table" >
-        <thead>
-        <tr>
-            <th class="text-center">
-                <input type="checkbox" id="check_all" class="ipt_check_all" >
-            </th>
-            <th class="text-center">{% trans 'Name' %}</th>
-            <th class="text-center">{% trans 'Type' %}</th>
-            <th class="text-center">{% trans 'Host' %}</th>
-            <th class="text-center">{% trans 'Database' %}</th>
-            <th class="text-center">{% trans 'Comment' %}</th>
-            <th class="text-center">{% trans 'Action' %}</th>
-        </tr>
-        </thead>
-        <tbody>
-        </tbody>
-    </table>
-</div>
-{% endblock %}
-{% block custom_foot_js %}
-<script>
-var inited = false;
-var database_app_table, url;
-
-function initTable() {
-    if (inited){
-        return
-    } else {
-        inited = true;
-    }
-    url = '{% url "api-perms:my-database-apps" %}';
-    var options = {
-        ele: $('#database_app_list_table'),
-        columnDefs: [
-            {targets: 1, createdCell: function (td, cellData, rowData) {
-                    var name = htmlEscape(cellData);
-                    $(td).html(name)
-                }},
-            {targets: 2, createdCell: function (td, cellData, rowData) {
-                    var type = htmlEscape(rowData.get_type_display);
-                    $(td).html(type);
-                }},
-            {targets: 3, createdCell: function (td, cellData, rowData) {
-                    var host = htmlEscape(cellData);
-                    $(td).html(host);
-                }},
-            {targets: 4, createdCell: function (td, cellData, rowData) {
-                    var database = htmlEscape(cellData);
-                    $(td).html(database);
-                }},
-            {targets: 6, createdCell: function (td, cellData, rowData) {
-                    var conn_btn = '<a href="{% url "luna-view" %}?type=database_app&login_to=' +  cellData +'" class="btn btn-xs btn-primary" target="_blank">{% trans "Connect" %}</a>';
-                    $(td).html(conn_btn)
-                }}
-        ],
-        ajax_url: url,
-        columns: [
-            {data: "id"},
-            {data: "name"},
-            {data: "type"},
-            {data: "host"},
-            {data: "database"},
-            {data: "comment", orderable: false},
-            {data: "id", orderable: false}
-        ]
-    };
-    database_app_table = jumpserver.initServerSideDataTable(options);
-    return database_app_table
-}
-$(document).ready(function(){
-    initTable();
-})
-</script>
-{% endblock %}

apps/applications/templates/applications/user_remote_app_list.html

@@ -1,73 +0,0 @@
-{% extends 'base.html' %}
-{% load i18n static %}
-
-{% block custom_head_css_js %}
-    <script src="{% static 'js/jquery.form.min.js' %}"></script>
-{% endblock %}
-
-{% block content %}
-<div class="mail-box-header">
-    <table class="table table-striped table-bordered table-hover " id="remote_app_list_table" >
-        <thead>
-        <tr>
-            <th class="text-center">
-                <input type="checkbox" id="check_all" class="ipt_check_all" >
-            </th>
-            <th class="text-center">{% trans 'Name' %}</th>
-            <th class="text-center">{% trans 'App type' %}</th>
-            <th class="text-center">{% trans 'Asset' %}</th>
-            <th class="text-center">{% trans 'Comment' %}</th>
-            <th class="text-center">{% trans 'Action' %}</th>
-        </tr>
-        </thead>
-        <tbody>
-        </tbody>
-    </table>
-</div>
-{% endblock %}
-{% block custom_foot_js %}
-<script>
-var inited = false;
-var remote_app_table, url;
-
-function initTable() {
-    if (inited){
-        return
-    } else {
-        inited = true;
-    }
-    url = '{% url "api-perms:my-remote-apps" %}';
-    var options = {
-        ele: $('#remote_app_list_table'),
-        columnDefs: [
-            {targets: 1, createdCell: function (td, cellData, rowData) {
-                    var name = htmlEscape(cellData);
-                    $(td).html(name)
-                }},
-            {targets: 3, createdCell: function (td, cellData, rowData) {
-                    var hostname = htmlEscape(cellData.hostname);
-                    $(td).html(hostname);
-                }},
-            {targets: 5, createdCell: function (td, cellData, rowData) {
-                    var conn_btn = '<a href="{% url "luna-view" %}?type=remote_app&login_to=' +  cellData +'" class="btn btn-xs btn-primary" target="_blank">{% trans "Connect" %}</a>'.replace("{{ DEFAULT_PK }}", cellData);
-                    $(td).html(conn_btn)
-                }}
-        ],
-        ajax_url: url,
-        columns: [
-            {data: "id"},
-            {data: "name"},
-            {data: "get_type_display", orderable: false},
-            {data: "asset_info", orderable: false},
-            {data: "comment", orderable: false},
-            {data: "id", orderable: false}
-        ]
-    };
-    remote_app_table = jumpserver.initServerSideDataTable(options);
-    return remote_app_table
-}
-$(document).ready(function(){
-    initTable();
-})
-</script>
-{% endblock %}

apps/applications/urls/views_urls.py

@@ -1,23 +1,7 @@
 # coding:utf-8
 from django.urls import path
-from .. import views
 
 app_name = 'applications'
 
 urlpatterns = [
-    # RemoteApp
-    path('remote-app/', views.RemoteAppListView.as_view(), name='remote-app-list'),
-    path('remote-app/create/', views.RemoteAppCreateView.as_view(), name='remote-app-create'),
-    path('remote-app/<uuid:pk>/update/', views.RemoteAppUpdateView.as_view(), name='remote-app-update'),
-    path('remote-app/<uuid:pk>/', views.RemoteAppDetailView.as_view(), name='remote-app-detail'),
-    # User RemoteApp view
-    path('user-remote-app/', views.UserRemoteAppListView.as_view(), name='user-remote-app-list'),
-
-    path('database-app/', views.DatabaseAppListView.as_view(), name='database-app-list'),
-    path('database-app/create/', views.DatabaseAppCreateView.as_view(), name='database-app-create'),
-    path('database-app/<uuid:pk>/update/', views.DatabaseAppUpdateView.as_view(), name='database-app-update'),
-    path('database-app/<uuid:pk>/', views.DatabaseAppDetailView.as_view(), name='database-app-detail'),
-    # User DatabaseApp view
-    path('user-database-app/', views.UserDatabaseAppListView.as_view(), name='user-database-app-list'),
-
 ]

apps/applications/views/__init__.py

@@ -1,2 +0,0 @@
-from .remote_app import *
-from .database_app import *

apps/applications/views/database_app.py

@@ -1,115 +0,0 @@
-# coding: utf-8
-#
-
-from django.http import Http404
-from django.views.generic import TemplateView
-from django.views.generic.edit import CreateView, UpdateView
-from django.utils.translation import ugettext_lazy as _
-from django.views.generic.detail import DetailView
-
-from common.permissions import PermissionsMixin, IsOrgAdmin, IsValidUser
-
-from .. import models, const, forms
-
-__all__ = [
-    'DatabaseAppListView', 'DatabaseAppCreateView', 'DatabaseAppUpdateView',
-    'DatabaseAppDetailView', 'UserDatabaseAppListView',
-]
-
-
-class DatabaseAppListView(PermissionsMixin, TemplateView):
-    template_name = 'applications/database_app_list.html'
-    permission_classes = [IsOrgAdmin]
-
-    def get_context_data(self, **kwargs):
-        context = {
-            'app': _("Application"),
-            'action': _('DatabaseApp list'),
-            'type_choices': const.DATABASE_APP_TYPE_CHOICES
-        }
-        kwargs.update(context)
-        return super().get_context_data(**kwargs)
-
-
-class BaseDatabaseAppCreateUpdateView:
-    template_name = 'applications/database_app_create_update.html'
-    model = models.DatabaseApp
-    permission_classes = [IsOrgAdmin]
-    default_type = const.DATABASE_APP_TYPE_MYSQL
-    form_class = forms.DatabaseAppMySQLForm
-    form_class_choices = {
-        const.DATABASE_APP_TYPE_MYSQL: forms.DatabaseAppMySQLForm,
-    }
-
-    def get_initial(self):
-        return {'type': self.get_type()}
-
-    def get_type(self):
-        return self.default_type
-
-    def get_form_class(self):
-        tp = self.get_type()
-        form_class = self.form_class_choices.get(tp)
-        if not form_class:
-            raise Http404()
-        return form_class
-
-
-class DatabaseAppCreateView(BaseDatabaseAppCreateUpdateView, CreateView):
-
-    def get_type(self):
-        tp = self.request.GET.get("type")
-        if tp:
-            return tp.lower()
-        return super().get_type()
-
-    def get_context_data(self, **kwargs):
-        context = {
-            'app': _('Applications'),
-            'action': _('Create DatabaseApp'),
-            'api_action': 'create'
-        }
-        kwargs.update(context)
-        return super().get_context_data(**kwargs)
-
-
-class DatabaseAppUpdateView(BaseDatabaseAppCreateUpdateView, UpdateView):
-
-    def get_type(self):
-        return self.object.type
-
-    def get_context_data(self, **kwargs):
-        context = {
-            'app': _('Applications'),
-            'action': _('Create DatabaseApp'),
-            'api_action': 'update'
-        }
-        kwargs.update(context)
-        return super().get_context_data(**kwargs)
-
-
-class DatabaseAppDetailView(PermissionsMixin, DetailView):
-    template_name = 'applications/database_app_detail.html'
-    model = models.DatabaseApp
-    context_object_name = 'database_app'
-    permission_classes = [IsOrgAdmin]
-
-    def get_context_data(self, **kwargs):
-        context = {
-            'app': _('Applications'),
-            'action': _('DatabaseApp detail'),
-        }
-        kwargs.update(context)
-        return super().get_context_data(**kwargs)
-
-
-class UserDatabaseAppListView(PermissionsMixin, TemplateView):
-    template_name = 'applications/user_database_app_list.html'
-    permission_classes = [IsValidUser]
-
-    def get_context_data(self, **kwargs):
-        context = {
-            'action': _('My DatabaseApp'),
-        }
-        kwargs.update(context)
-        return super().get_context_data(**kwargs)

apps/applications/views/remote_app.py

@@ -1,128 +0,0 @@
-#  coding: utf-8
-#
-
-from django.http import Http404
-from django.utils.translation import ugettext as _
-from django.views.generic import TemplateView
-from django.views.generic.edit import CreateView, UpdateView
-from django.views.generic.detail import DetailView
-
-from common.permissions import PermissionsMixin, IsOrgAdmin, IsValidUser
-
-from ..models import RemoteApp
-from .. import forms, const
-
-
-__all__ = [
-    'RemoteAppListView', 'RemoteAppCreateView', 'RemoteAppUpdateView',
-    'RemoteAppDetailView', 'UserRemoteAppListView',
-]
-
-
-class RemoteAppListView(PermissionsMixin, TemplateView):
-    template_name = 'applications/remote_app_list.html'
-    permission_classes = [IsOrgAdmin]
-
-    def get_context_data(self, **kwargs):
-        context = {
-            'app': _('Applications'),
-            'action': _('RemoteApp list'),
-            'type_choices': const.REMOTE_APP_TYPE_CHOICES,
-        }
-        kwargs.update(context)
-        return super().get_context_data(**kwargs)
-
-
-class BaseRemoteAppCreateUpdateView:
-    template_name = 'applications/remote_app_create_update.html'
-    model = RemoteApp
-    permission_classes = [IsOrgAdmin]
-    default_type = const.REMOTE_APP_TYPE_CHROME
-    form_class = forms.RemoteAppChromeForm
-    form_class_choices = {
-        const.REMOTE_APP_TYPE_CHROME: forms.RemoteAppChromeForm,
-        const.REMOTE_APP_TYPE_MYSQL_WORKBENCH: forms.RemoteAppMySQLWorkbenchForm,
-        const.REMOTE_APP_TYPE_VMWARE_CLIENT: forms.RemoteAppVMwareForm,
-        const.REMOTE_APP_TYPE_CUSTOM: forms.RemoteAppCustomForm
-    }
-
-    def get_initial(self):
-        return {'type': self.get_type()}
-
-    def get_type(self):
-        return self.default_type
-
-    def get_form_class(self):
-        tp = self.get_type()
-        form_class = self.form_class_choices.get(tp)
-        if not form_class:
-            raise Http404()
-        return form_class
-
-
-class RemoteAppCreateView(BaseRemoteAppCreateUpdateView,
-                          PermissionsMixin, CreateView):
-
-    def get_context_data(self, **kwargs):
-        context = {
-            'app': _('Applications'),
-            'action': _('Create RemoteApp'),
-            'api_action': 'create'
-        }
-        kwargs.update(context)
-        return super().get_context_data(**kwargs)
-
-    def get_type(self):
-        tp = self.request.GET.get("type")
-        if tp:
-            return tp.lower()
-        return super().get_type()
-
-
-class RemoteAppUpdateView(BaseRemoteAppCreateUpdateView,
-                          PermissionsMixin, UpdateView):
-
-    def get_initial(self):
-        initial_data = super().get_initial()
-        params = {k: v for k, v in self.object.params.items()}
-        initial_data.update(params)
-        return initial_data
-
-    def get_type(self):
-        return self.object.type
-
-    def get_context_data(self, **kwargs):
-        context = {
-            'app': _('Applications'),
-            'action': _('Update RemoteApp'),
-            'api_action': 'update'
-        }
-        kwargs.update(context)
-        return super().get_context_data(**kwargs)
-
-
-class RemoteAppDetailView(PermissionsMixin, DetailView):
-    template_name = 'applications/remote_app_detail.html'
-    model = RemoteApp
-    context_object_name = 'remote_app'
-    permission_classes = [IsOrgAdmin]
-
-    def get_context_data(self, **kwargs):
-        context = {
-            'app': _('Applications'),
-            'action': _('RemoteApp detail'),
-        }
-        kwargs.update(context)
-        return super().get_context_data(**kwargs)
-
-
-class UserRemoteAppListView(PermissionsMixin, TemplateView):
-    template_name = 'applications/user_remote_app_list.html'
-    permission_classes = [IsValidUser]
-
-    def get_context_data(self, **kwargs):
-        context = {
-            'action': _('My RemoteApp'),
-        }
-        kwargs.update(context)
-        return super().get_context_data(**kwargs)

apps/assets/api/admin_user.py

@@ -1,17 +1,4 @@
-# ~*~ coding: utf-8 ~*~
-# Copyright (C) 2014-2018 Beijing DuiZhan Technology Co.,Ltd. All Rights Reserved.
-#
-# Licensed under the GNU General Public License v2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.gnu.org/licenses/gpl-2.0.html
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+
 
 from django.db import transaction
 from django.db.models import Count
@@ -49,7 +36,7 @@ class AdminUserViewSet(OrgBulkModelViewSet):
 
     def get_queryset(self):
         queryset = super().get_queryset()
-        queryset = queryset.annotate(_assets_amount=Count('assets'))
+        queryset = queryset.annotate(assets_amount=Count('assets'))
         return queryset
 
     def destroy(self, request, *args, **kwargs):

apps/assets/api/asset.py

@@ -1,9 +1,6 @@
 # -*- coding: utf-8 -*-
 #
 
-import random
-
-from rest_framework.response import Response
 from rest_framework.viewsets import ModelViewSet
 from rest_framework.generics import RetrieveAPIView
 from django.shortcuts import get_object_or_404
@@ -33,7 +30,10 @@ class AssetViewSet(OrgBulkModelViewSet):
     API endpoint that allows Asset to be viewed or edited.
     """
     model = Asset
-    filter_fields = ("hostname", "ip", "systemuser__id", "admin_user__id")
+    filter_fields = (
+        "hostname", "ip", "systemuser__id", "admin_user__id", "platform__base",
+        "is_active"
+    )
     search_fields = ("hostname", "ip")
     ordering_fields = ("hostname", "ip", "port", "cpu_cores")
     serializer_classes = {
@@ -74,12 +74,16 @@ class AssetPlatformViewSet(ModelViewSet):
     queryset = Platform.objects.all()
     permission_classes = (IsSuperUser,)
     serializer_class = serializers.PlatformSerializer
-    filterset_fields = ['name', 'base']
+    filter_fields = ['name', 'base']
     search_fields = ['name']
 
+    def get_permissions(self):
+        if self.request.method.lower() in ['get', 'options']:
+            self.permission_classes = (IsOrgAdmin,)
+        return super().get_permissions()
+
     def check_object_permissions(self, request, obj):
-        if request.method.lower() in ['delete', 'put', 'patch'] and \
-                obj.internal:
+        if request.method.lower() in ['delete', 'put', 'patch'] and obj.internal:
             self.permission_denied(
                 request, message={"detail": "Internal platform"}
             )

apps/assets/api/asset_user.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 #
+import coreapi
 from django.conf import settings
 from rest_framework.response import Response
 from rest_framework import generics, filters
@@ -54,6 +55,15 @@ class AssetUserSearchBackend(filters.BaseFilterBackend):
 
 
 class AssetUserLatestFilterBackend(filters.BaseFilterBackend):
+    def get_schema_fields(self, view):
+        return [
+            coreapi.Field(
+                name='latest', location='query', required=False,
+                type='string', example='1',
+                description='Only the latest version'
+            )
+        ]
+
     def filter_queryset(self, request, queryset, view):
         latest = request.GET.get('latest') == '1'
         if latest:
@@ -64,7 +74,7 @@ class AssetUserLatestFilterBackend(filters.BaseFilterBackend):
 class AssetUserViewSet(CommonApiMixin, BulkModelViewSet):
     serializer_classes = {
         'default': serializers.AssetUserWriteSerializer,
-        'list': serializers.AssetUserReadSerializer,
+        'display': serializers.AssetUserReadSerializer,
         'retrieve': serializers.AssetUserReadSerializer,
     }
     permission_classes = [IsOrgAdminOrAppUser]
@@ -84,12 +94,15 @@ class AssetUserViewSet(CommonApiMixin, BulkModelViewSet):
 
     def get_object(self):
         pk = self.kwargs.get("pk")
+        if pk is None:
+            return
         queryset = self.get_queryset()
         obj = queryset.get(id=pk)
         return obj
 
     def get_exception_handler(self):
         def handler(e, context):
+            logger.error(e, exc_info=True)
             return Response({"error": str(e)}, status=400)
         return handler
 

apps/assets/api/gathered_user.py

@@ -18,5 +18,5 @@ class GatheredUserViewSet(OrgModelViewSet):
     permission_classes = [IsOrgAdmin]
     extra_filter_backends = [AssetRelatedByNodeFilterBackend]
 
-    filter_fields = ['asset', 'username', 'present']
+    filter_fields = ['asset', 'username', 'present', 'asset__ip', 'asset__hostname']
     search_fields = ['username', 'asset__ip', 'asset__hostname']

apps/assets/api/system_user_relation.py

@@ -65,7 +65,7 @@ class SystemUserAssetRelationViewSet(BaseRelationViewSet):
     serializer_class = serializers.SystemUserAssetRelationSerializer
     model = models.SystemUser.assets.through
     permission_classes = (IsOrgAdmin,)
-    filterset_fields = [
+    filter_fields = [
         'id', 'asset', 'systemuser',
     ]
     search_fields = [
@@ -91,7 +91,7 @@ class SystemUserNodeRelationViewSet(BaseRelationViewSet):
     serializer_class = serializers.SystemUserNodeRelationSerializer
     model = models.SystemUser.nodes.through
     permission_classes = (IsOrgAdmin,)
-    filterset_fields = [
+    filter_fields = [
         'id', 'node', 'systemuser',
     ]
     search_fields = [
@@ -112,7 +112,7 @@ class SystemUserUserRelationViewSet(BaseRelationViewSet):
     serializer_class = serializers.SystemUserUserRelationSerializer
     model = models.SystemUser.users.through
     permission_classes = (IsOrgAdmin,)
-    filterset_fields = [
+    filter_fields = [
         'id', 'user', 'systemuser',
     ]
     search_fields = [

apps/assets/filters.py

@@ -65,7 +65,7 @@ class AssetByNodeFilterBackend(filters.BaseFilterBackend):
 
 
 class LabelFilterBackend(filters.BaseFilterBackend):
-    sep = '#'
+    sep = ':'
     query_arg = 'label'
 
     def get_schema_fields(self, view):
@@ -84,6 +84,8 @@ class LabelFilterBackend(filters.BaseFilterBackend):
 
         q = None
         for kv in labels_query:
+            if '#' in kv:
+                self.sep = '#'
             if self.sep not in kv:
                 continue
             key, value = kv.strip().split(self.sep)[:2]

apps/assets/forms/__init__.py

@@ -1,8 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-from .asset import *
-from .label import *
-from .user import *
-from .domain import *
-from .cmd_filter import *
-from .platform import *

apps/assets/forms/asset.py

@@ -1,172 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-from itertools import groupby
-from django import forms
-from django.utils.translation import gettext_lazy as _
-
-from common.utils import get_logger
-from orgs.mixins.forms import OrgModelForm
-
-from ..models import Asset, Platform
-
-
-logger = get_logger(__file__)
-__all__ = [
-    'AssetCreateUpdateForm', 'AssetBulkUpdateForm', 'ProtocolForm',
-]
-
-
-class ProtocolForm(forms.Form):
-    name = forms.ChoiceField(
-        choices=Asset.PROTOCOL_CHOICES, label=_("Name"), initial='ssh',
-        widget=forms.Select(attrs={'class': 'form-control protocol-name'})
-    )
-    port = forms.IntegerField(
-        max_value=65534, min_value=1, label=_("Port"), initial=22,
-        widget=forms.TextInput(attrs={'class': 'form-control protocol-port'})
-    )
-
-
-class AssetCreateUpdateForm(OrgModelForm):
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.set_platform_to_name()
-        self.set_fields_queryset()
-
-    def set_fields_queryset(self):
-        nodes_field = self.fields['nodes']
-        nodes_choices = []
-        if self.instance:
-            nodes_choices = [
-                (n.id, n.full_value) for n in
-                self.instance.nodes.all()
-            ]
-        nodes_field.choices = nodes_choices
-
-    @staticmethod
-    def sorted_platform(platform):
-        if platform['base'] == 'Other':
-            return 'zz'
-        return platform['base']
-
-    def set_platform_to_name(self):
-        choices = []
-        platforms = Platform.objects.all().values('name', 'base')
-        platforms_sorted = sorted(platforms, key=self.sorted_platform)
-        platforms_grouped = groupby(platforms_sorted, key=lambda x: x['base'])
-        for i in platforms_grouped:
-            base = i[0]
-            grouped = sorted(i[1], key=lambda x: x['name'])
-            grouped = [(j['name'], j['name']) for j in grouped]
-            choices.append(
-                (base, grouped)
-            )
-        platform_field = self.fields['platform']
-        platform_field.choices = choices
-        if self.instance:
-            self.initial['platform'] = self.instance.platform.name
-
-    def add_nodes_initial(self, node):
-        nodes_field = self.fields['nodes']
-        nodes_field.choices.append((node.id, node.full_value))
-        nodes_field.initial = [node]
-
-    class Meta:
-        model = Asset
-        fields = [
-            'hostname', 'ip', 'public_ip', 'protocols', 'comment',
-            'nodes', 'is_active', 'admin_user', 'labels', 'platform',
-            'domain', 'number',
-        ]
-        widgets = {
-            'nodes': forms.SelectMultiple(attrs={
-                'class': 'nodes-select2', 'data-placeholder': _('Nodes')
-            }),
-            'admin_user': forms.Select(attrs={
-                'class': 'select2', 'data-placeholder': _('Admin user')
-            }),
-            'labels': forms.SelectMultiple(attrs={
-                'class': 'select2', 'data-placeholder': _('Label')
-            }),
-            'domain': forms.Select(attrs={
-                'class': 'select2', 'data-placeholder': _('Domain')
-            }),
-            'platform': forms.Select(attrs={
-                'class': 'select2', 'data-placeholder': _('Platform')
-            }),
-        }
-        labels = {
-            'nodes': _("Node"),
-        }
-        help_texts = {
-            'admin_user': _(
-                'root or other NOPASSWD sudo privilege user existed in asset,'
-                'If asset is windows or other set any one, more see admin user left menu'
-            ),
-            'platform': _("Windows 2016 RDP protocol is different, If is window 2016, set it"),
-            'domain': _("If your have some network not connect with each other, you can set domain")
-        }
-
-
-class AssetBulkUpdateForm(OrgModelForm):
-    assets = forms.ModelMultipleChoiceField(
-        required=True,
-        label=_('Select assets'), queryset=Asset.objects,
-        widget=forms.SelectMultiple(
-            attrs={
-                'class': 'select2',
-                'data-placeholder': _('Select assets')
-            }
-        )
-    )
-
-    class Meta:
-        model = Asset
-        fields = [
-            'assets', 'admin_user', 'labels', 'platform',
-            'domain',
-        ]
-        widgets = {
-            'labels': forms.SelectMultiple(
-                attrs={'class': 'select2', 'data-placeholder': _('Label')}
-            ),
-            'nodes': forms.SelectMultiple(
-                attrs={'class': 'select2', 'data-placeholder': _('Node')}
-            ),
-        }
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.set_fields_queryset()
-
-        # 重写其他字段为不再required
-        for name, field in self.fields.items():
-            if name != 'assets':
-                field.required = False
-
-    def set_fields_queryset(self):
-        assets_field = self.fields['assets']
-        if hasattr(self, 'data'):
-            assets_field.queryset = Asset.objects.all()
-
-    def save(self, commit=True):
-        changed_fields = []
-        for field in self._meta.fields:
-            if self.data.get(field) not in [None, '']:
-                changed_fields.append(field)
-
-        cleaned_data = {k: v for k, v in self.cleaned_data.items()
-                        if k in changed_fields}
-        assets = cleaned_data.pop('assets')
-        labels = cleaned_data.pop('labels', [])
-        nodes = cleaned_data.pop('nodes', None)
-        assets = Asset.objects.filter(id__in=[asset.id for asset in assets])
-        assets.update(**cleaned_data)
-
-        if labels:
-            for asset in assets:
-                asset.labels.set(labels)
-        if nodes:
-            for asset in assets:
-                asset.nodes.set(nodes)
-        return assets

apps/assets/forms/cmd_filter.py

@@ -1,40 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-from django import forms
-from django.core.exceptions import ValidationError
-from django.utils.translation import ugettext_lazy as _
-import re
-
-from orgs.mixins.forms import OrgModelForm
-from ..models import CommandFilter, CommandFilterRule
-
-__all__ = ['CommandFilterForm', 'CommandFilterRuleForm']
-
-
-class CommandFilterForm(OrgModelForm):
-    class Meta:
-        model = CommandFilter
-        fields = ['name', 'comment']
-
-
-class CommandFilterRuleForm(OrgModelForm):
-    invalid_pattern = re.compile(r'[\.\*\+\[\\\?\{\}\^\$\|\(\)\#\<\>]')
-
-    class Meta:
-        model = CommandFilterRule
-        fields = [
-            'filter', 'type', 'content', 'priority', 'action', 'comment'
-        ]
-        widgets = {
-            'content':  forms.Textarea(attrs={
-                'placeholder': 'eg:\r\nreboot\r\nrm -rf'
-            }),
-        }
-
-    def clean_content(self):
-        content = self.cleaned_data.get("content")
-        if self.invalid_pattern.search(content):
-            invalid_char = self.invalid_pattern.pattern.replace('\\', '')
-            msg = _("Content should not be contain: {}").format(invalid_char)
-            raise ValidationError(msg)
-        return content

apps/assets/forms/domain.py

@@ -1,79 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-from django import forms
-from django.utils.translation import gettext_lazy as _
-
-from orgs.mixins.forms import OrgModelForm
-from ..models import Domain, Asset, Gateway
-from .user import PasswordAndKeyAuthForm
-
-__all__ = ['DomainForm', 'GatewayForm']
-
-
-class DomainForm(forms.ModelForm):
-    assets = forms.ModelMultipleChoiceField(
-        queryset=Asset.objects, label=_('Asset'), required=False,
-        widget=forms.SelectMultiple(
-            attrs={'class': 'select2', 'data-placeholder': _('Select assets')}
-        )
-    )
-
-    class Meta:
-        model = Domain
-        fields = ['name', 'comment', 'assets']
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.set_fields_queryset()
-
-    def set_fields_queryset(self):
-        assets_field = self.fields.get('assets')
-
-        # 没有data代表是渲染表单, 有data代表是提交创建/更新表单
-        if not self.data:
-            # 有instance 代表渲染更新表单, 否则是创建表单
-            # 前端渲染优化, 防止过多资产, 设置assets queryset为none
-            if self.instance:
-                assets_field.initial = self.instance.assets.all()
-                assets_field.queryset = self.instance.assets.all()
-            else:
-                assets_field.queryset = Asset.objects.none()
-        else:
-            assets_field.queryset = Asset.objects.all()
-
-    def save(self, commit=True):
-        instance = super().save(commit=commit)
-        assets = self.cleaned_data['assets']
-        instance.assets.set(assets)
-        return instance
-
-
-class GatewayForm(PasswordAndKeyAuthForm, OrgModelForm):
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        password_field = self.fields.get('password')
-        password_field.help_text = _('Password should not contain special characters')
-        protocol_field = self.fields.get('protocol')
-        protocol_field.choices = [Gateway.PROTOCOL_CHOICES[0]]
-
-    def save(self, commit=True):
-        # Because we define custom field, so we need rewrite :method: `save`
-        instance = super().save()
-        password = self.cleaned_data.get('password')
-        private_key, public_key = super().gen_keys()
-        instance.set_auth(password=password, private_key=private_key)
-        return instance
-
-    class Meta:
-        model = Gateway
-        fields = [
-            'name', 'ip', 'port', 'username', 'protocol', 'domain', 'password',
-            'private_key',  'is_active', 'comment',
-        ]
-        help_texts = {
-            'protocol': _("SSH gateway support proxy SSH,RDP,VNC")
-        }
-        widgets = {
-            'name': forms.TextInput(attrs={'placeholder': _('Name')}),
-            'username': forms.TextInput(attrs={'placeholder': _('Username')}),
-        }

apps/assets/forms/label.py

@@ -1,46 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-from django import forms
-from django.utils.translation import gettext_lazy as _
-
-from ..models import Label, Asset
-
-__all__ = ['LabelForm']
-
-
-class LabelForm(forms.ModelForm):
-    assets = forms.ModelMultipleChoiceField(
-        queryset=Asset.objects.none(), label=_('Asset'), required=False,
-        widget=forms.SelectMultiple(
-            attrs={'class': 'select2', 'data-placeholder': _('Select assets')}
-        )
-    )
-
-    class Meta:
-        model = Label
-        fields = ['name', 'value', 'assets']
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.set_fields_queryset()
-
-    def set_fields_queryset(self):
-        assets_field = self.fields.get('assets')
-
-        # 没有data代表是渲染表单, 有data代表是提交创建/更新表单
-        if not self.data:
-            # 有instance 代表渲染更新表单, 否则是创建表单
-            # 前端渲染优化, 防止过多资产, 设置assets queryset为none
-            if self.instance:
-                assets_field.initial = self.instance.assets.all()
-                assets_field.queryset = self.instance.assets.all()
-            else:
-                assets_field.queryset = Asset.objects.none()
-        else:
-            assets_field.queryset = Asset.objects.all()
-
-    def save(self, commit=True):
-        label = super().save(commit=commit)
-        assets = self.cleaned_data['assets']
-        label.assets.set(assets)
-        return label

apps/assets/forms/platform.py

@@ -1,42 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from django import forms
-from django.utils.translation import ugettext_lazy as _
-
-from ..models import Platform
-
-
-__all__ = ['PlatformForm', 'PlatformMetaForm']
-
-
-class PlatformMetaForm(forms.Form):
-    SECURITY_CHOICES = (
-        ('rdp', "RDP"),
-        ('nla', "NLA"),
-        ('tls', 'TLS'),
-        ('any', "Any"),
-    )
-    CONSOLE_CHOICES = (
-        (True, _('Yes')),
-        (False, _('No')),
-    )
-    security = forms.ChoiceField(
-        choices=SECURITY_CHOICES, initial='any', label=_("RDP security"),
-        required=False,
-    )
-    console = forms.ChoiceField(
-        choices=CONSOLE_CHOICES, initial=False, label=_("RDP console"),
-        required=False,
-    )
-
-
-class PlatformForm(forms.ModelForm):
-    class Meta:
-        model = Platform
-        fields = [
-            'name', 'base', 'comment',
-        ]
-        labels = {
-            'base': _("Base platform")
-        }
-

apps/assets/forms/user.py

@@ -1,115 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-from django import forms
-from django.utils.translation import gettext_lazy as _
-
-from common.utils import validate_ssh_private_key, ssh_pubkey_gen, get_logger
-from orgs.mixins.forms import OrgModelForm
-from ..models import AdminUser, SystemUser
-
-logger = get_logger(__file__)
-__all__ = [
-    'FileForm', 'SystemUserForm', 'AdminUserForm', 'PasswordAndKeyAuthForm',
-]
-
-
-class FileForm(forms.Form):
-    file = forms.FileField()
-
-
-class PasswordAndKeyAuthForm(forms.ModelForm):
-    # Form field name can not start with `_`, so redefine it,
-    password = forms.CharField(
-        widget=forms.PasswordInput, max_length=128,
-        strip=True, required=False,
-        help_text=_('Password or private key passphrase'),
-        label=_("Password"),
-    )
-    # Need use upload private key file except paste private key content
-    private_key = forms.FileField(required=False, label=_("Private key"))
-
-    def clean_private_key(self):
-        private_key_f = self.cleaned_data['private_key']
-        password = self.cleaned_data['password']
-
-        if private_key_f:
-            key_string = private_key_f.read()
-            private_key_f.seek(0)
-            key_string = key_string.decode()
-
-            if not validate_ssh_private_key(key_string, password):
-                msg = _('Invalid private key, Only support '
-                        'RSA/DSA format key')
-                raise forms.ValidationError(msg)
-        return private_key_f
-
-    def validate_password_key(self):
-        password = self.cleaned_data['password']
-        private_key_f = self.cleaned_data.get('private_key', '')
-
-        if not password and not private_key_f:
-            raise forms.ValidationError(_(
-                'Password and private key file must be input one'
-            ))
-
-    def gen_keys(self):
-        password = self.cleaned_data.get('password', '') or None
-        private_key_f = self.cleaned_data['private_key']
-        public_key = private_key = None
-
-        if private_key_f:
-            private_key = private_key_f.read().strip().decode('utf-8')
-            public_key = ssh_pubkey_gen(private_key=private_key, password=password)
-        return private_key, public_key
-
-
-class AdminUserForm(PasswordAndKeyAuthForm):
-    def save(self, commit=True):
-        raise forms.ValidationError("Use api to save")
-
-    class Meta:
-        model = AdminUser
-        fields = ['name', 'username', 'password', 'private_key', 'comment']
-        widgets = {
-            'name': forms.TextInput(attrs={'placeholder': _('Name')}),
-            'username': forms.TextInput(attrs={'placeholder': _('Username')}),
-        }
-
-
-class SystemUserForm(OrgModelForm, PasswordAndKeyAuthForm):
-    # Admin user assets define, let user select, save it in form not in view
-    auto_generate_key = forms.BooleanField(initial=True, required=False)
-
-    def save(self, commit=True):
-        raise forms.ValidationError("Use api to save")
-
-    class Meta:
-        model = SystemUser
-        fields = [
-            'name', 'username', 'protocol', 'auto_generate_key',
-            'password', 'private_key', 'auto_push', 'sudo',
-            'username_same_with_user',
-            'comment', 'shell', 'priority', 'login_mode', 'cmd_filters',
-            'sftp_root',
-        ]
-        widgets = {
-            'name': forms.TextInput(attrs={'placeholder': _('Name')}),
-            'username': forms.TextInput(attrs={'placeholder': _('Username')}),
-            'cmd_filters': forms.SelectMultiple(attrs={
-                'class': 'select2', 'data-placeholder': _('Command filter')
-            }),
-        }
-        labels = {
-            'username_same_with_user': _("Username same with user"),
-        }
-        help_texts = {
-            'auto_push': _('Auto push system user to asset'),
-            'priority': _('1-100, High level will be using login asset as default, '
-                          'if user was granted more than 2 system user'),
-            'login_mode': _('If you choose manual login mode, you do not '
-                            'need to fill in the username and password.'),
-            'sudo': _("Use comma split multi command, ex: /bin/whoami,/bin/ifconfig"),
-            'sftp_root': _("SFTP root dir, tmp, home or custom"),
-            'username_same_with_user': _("Username is dynamic, When connect asset, using current user's username"),
-            # 'username_same_with_user': _("用户名是动态的，登录资产时使用当前用户的用户名登录"),
-        }

apps/assets/models/asset.py

@@ -244,6 +244,10 @@ class Asset(ProtocolsMixin, NodesRelationMixin, OrgModelMixin):
     def platform_base(self):
         return self.platform.base
 
+    @lazyproperty
+    def admin_user_display(self):
+        return self.admin_user.name
+
     @lazyproperty
     def admin_user_username(self):
         """求可连接性时，直接用用户名去取，避免再查一次admin user

apps/assets/serializers/asset.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 from rest_framework import serializers
-from django.db.models import Prefetch, F
+from django.db.models import Prefetch, F, Count
 
 from django.utils.translation import ugettext_lazy as _
 
@@ -73,21 +73,35 @@ class AssetSerializer(BulkOrgResourceModelSerializer):
     class Meta:
         model = Asset
         list_serializer_class = AdaptedBulkListSerializer
-        fields = [
-            'id', 'ip', 'hostname', 'protocol', 'port',
-            'protocols', 'platform', 'is_active', 'public_ip', 'domain',
-            'admin_user', 'nodes', 'labels', 'number', 'vendor', 'model', 'sn',
-            'cpu_model', 'cpu_count', 'cpu_cores', 'cpu_vcpus', 'memory',
-            'disk_total', 'disk_info', 'os', 'os_version', 'os_arch',
-            'hostname_raw', 'comment', 'created_by', 'date_created',
-            'hardware_info',
+        fields_mini = ['id', 'hostname', 'ip']
+        fields_small = fields_mini + [
+            'protocol', 'port', 'protocols', 'is_active', 'public_ip',
+            'number', 'vendor', 'model', 'sn', 'cpu_model', 'cpu_count',
+            'cpu_cores', 'cpu_vcpus', 'memory', 'disk_total', 'disk_info',
+            'os', 'os_version', 'os_arch', 'hostname_raw', 'comment',
+            'created_by', 'date_created', 'hardware_info',
         ]
-        read_only_fields = (
+        fields_fk = [
+            'admin_user', 'admin_user_display', 'domain', 'platform'
+        ]
+        fk_only_fields = {
+            'platform': ['name']
+        }
+        fields_m2m = [
+            'nodes', 'labels',
+        ]
+        annotates_fields = {
+            # 'admin_user_display': 'admin_user__name'
+        }
+        fields_as = list(annotates_fields.keys())
+        fields = fields_small + fields_fk + fields_m2m + fields_as
+        read_only_fields = [
             'vendor', 'model', 'sn', 'cpu_model', 'cpu_count',
             'cpu_cores', 'cpu_vcpus', 'memory', 'disk_total', 'disk_info',
             'os', 'os_version', 'os_arch', 'hostname_raw',
             'created_by', 'date_created',
-        )
+        ] + fields_as
+
         extra_kwargs = {
             'protocol': {'write_only': True},
             'port': {'write_only': True},
@@ -98,11 +112,7 @@ class AssetSerializer(BulkOrgResourceModelSerializer):
     @classmethod
     def setup_eager_loading(cls, queryset):
         """ Perform necessary eager loading of data. """
-        queryset = queryset.prefetch_related(
-            Prefetch('nodes', queryset=Node.objects.all().only('id')),
-            Prefetch('labels', queryset=Label.objects.all().only('id')),
-        ).select_related('admin_user', 'domain', 'platform') \
-         .annotate(platform_base=F('platform__base'))
+        queryset = queryset.select_related('admin_user', 'domain', 'platform')
         return queryset
 
     def compatible_with_old_protocol(self, validated_data):
@@ -134,14 +144,8 @@ class AssetDisplaySerializer(AssetSerializer):
     connectivity = ConnectivitySerializer(read_only=True, label=_("Connectivity"))
 
     class Meta(AssetSerializer.Meta):
-        fields = [
-            'id', 'ip', 'hostname', 'protocol', 'port',
-            'protocols', 'is_active', 'public_ip',
-            'number', 'vendor', 'model', 'sn',
-            'cpu_model', 'cpu_count', 'cpu_cores', 'cpu_vcpus', 'memory',
-            'disk_total', 'disk_info', 'os', 'os_version', 'os_arch',
-            'hostname_raw', 'comment', 'created_by', 'date_created',
-            'hardware_info', 'connectivity',
+        fields = AssetSerializer.Meta.fields + [
+            'connectivity',
         ]
 
     @classmethod

apps/assets/serializers/cmd_filter.py

@@ -2,7 +2,6 @@
 #
 import re
 from rest_framework import serializers
-from django.utils.translation import ugettext_lazy as _
 
 from common.fields import ChoiceDisplayField
 from common.serializers import AdaptedBulkListSerializer
@@ -27,11 +26,20 @@ class CommandFilterSerializer(BulkOrgResourceModelSerializer):
 
 
 class CommandFilterRuleSerializer(BulkOrgResourceModelSerializer):
-    serializer_choice_field = ChoiceDisplayField
+    # serializer_choice_field = ChoiceDisplayField
     invalid_pattern = re.compile(r'[\.\*\+\[\\\?\{\}\^\$\|\(\)\#\<\>]')
+    type_display = serializers.ReadOnlyField(source='get_type_display')
+    action_display = serializers.ReadOnlyField(source='get_action_display')
 
     class Meta:
         model = CommandFilterRule
+        fields_mini = ['id']
+        fields_small = fields_mini + [
+           'type', 'type_display', 'content', 'priority',
+           'action', 'action_display',
+           'comment', 'created_by', 'date_created', 'date_updated'
+        ]
+        fields_fk = ['filter']
         fields = '__all__'
         list_serializer_class = AdaptedBulkListSerializer
 

apps/assets/serializers/domain.py

@@ -15,11 +15,18 @@ class DomainSerializer(BulkOrgResourceModelSerializer):
 
     class Meta:
         model = Domain
-        fields = [
-            'id', 'name', 'asset_count', 'gateway_count', 'comment', 'assets',
-            'date_created'
+        fields_mini = ['id', 'name']
+        fields_small = fields_mini + [
+            'comment', 'date_created'
         ]
-        read_only_fields = ( 'asset_count', 'gateway_count', 'date_created')
+        fields_m2m = [
+            'asset_count', 'assets', 'gateway_count',
+        ]
+        fields = fields_small + fields_m2m
+        read_only_fields = ('asset_count', 'gateway_count', 'date_created')
+        extra_kwargs = {
+            'assets': {'required': False}
+        }
         list_serializer_class = AdaptedBulkListSerializer
 
     @staticmethod
@@ -41,6 +48,16 @@ class GatewaySerializer(AuthSerializerMixin, BulkOrgResourceModelSerializer):
             'date_updated', 'created_by', 'comment',
         ]
 
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.protocol_limit_to_ssh()
+
+    def protocol_limit_to_ssh(self):
+        protocol_field = self.fields['protocol']
+        choices = protocol_field.choices
+        choices.pop('rdp')
+        protocol_field._choices = choices
+
 
 class GatewayWithAuthSerializer(GatewaySerializer):
     def get_field_names(self, declared_fields, info):
@@ -51,6 +68,8 @@ class GatewayWithAuthSerializer(GatewaySerializer):
         return fields
 
 
+
+
 class DomainWithGatewaySerializer(BulkOrgResourceModelSerializer):
     gateways = GatewayWithAuthSerializer(many=True, read_only=True)
 

apps/assets/serializers/gathered_user.py

@@ -16,7 +16,7 @@ class GatheredUserSerializer(OrgResourceModelSerializerMixin):
             'present', 'date_created', 'date_updated'
         ]
         read_only_fields = fields
-        labels = {
-            'hostname': _("Hostname"),
-            'ip': "IP"
+        extra_kwargs = {
+            'hostname': {'label': _("Hostname")},
+            'ip': {'label': 'IP'},
         }

apps/assets/serializers/label.py

@@ -20,6 +20,9 @@ class LabelSerializer(BulkOrgResourceModelSerializer):
         read_only_fields = (
             'category', 'date_created', 'asset_count', 'get_category_display'
         )
+        extra_kwargs = {
+            'assets': {'required': False}
+        }
         list_serializer_class = AdaptedBulkListSerializer
 
     @staticmethod

apps/assets/serializers/system_user.py

@@ -34,7 +34,7 @@ class SystemUserSerializer(AuthSerializerMixin, BulkOrgResourceModelSerializer):
             'priority', 'username_same_with_user',
             'auto_push', 'cmd_filters', 'sudo', 'shell', 'comment',
             'auto_generate_key', 'sftp_root',
-            'assets_amount',
+            'assets_amount', 'date_created', 'created_by'
         ]
         extra_kwargs = {
             'password': {"write_only": True},

apps/assets/templates/assets/_asset_group_bulk_update_modal.html

@@ -1,41 +0,0 @@
-{% extends '_modal.html' %}
-{% load i18n %}
-{% block modal_id %}asset_group_bulk_update_modal{% endblock %}
-{% block modal_class %}modal-lg{% endblock %}
-{% block modal_title%}{% trans "Update asset group" %}{% endblock %}
-{% block modal_body %}
-{% load bootstrap3 %}
-<p class="text-success text-center">{% trans "Hint: only change the field you want to update." %}</p>
-<form method="post" class="form-horizontal" action="" id="fm_asset_group_bulk_update">
-    <div class="form-group">
-        <label for="assets" class="col-sm-2 control-label">{% trans 'Assets' %}</label>
-        <div class="col-sm-9" id="select2-container">
-            <select name="assets" id="select2_groups" data-placeholder="{% trans 'Select Asset' %}" class="select2 form-control m-b" multiple>
-                {% for asset in assets %}
-                    <option value="{{ asset.id }}">{{ asset.ip }}</option>
-                {% endfor %}
-            </select>
-        </div>
-    </div>
-	<div class="form-group">
-        <label for="system_users" class="col-sm-2 control-label">{% trans 'System users' %}</label>
-        <div class="col-sm-9" id="select2-container">
-            <select name="system_users" id="select2_groups" data-placeholder="{% trans 'Select System Users' %}" class="select2 form-control m-b" multiple>
-                {% for system_user in system_users %}
-                    <option value="{{ system_user.id }}">{{ system_user.name }}</option>
-                {% endfor %}
-            </select>
-        </div>
-    </div>
-
-    <div class="form-group">
-        <div class="col-sm-9 col-lg-9 col-sm-offset-2">
-            <div class="checkbox checkbox-success">
-                <input type="checkbox" name="enable_mfa" checked id="id_enable_mfa"><label for="id_enable_mfa">{% trans 'Enable-MFA' %}</label>
-            </div>
-        </div>
-    </div>
-
-</form>
-{% endblock %}
-{% block modal_confirm_id %}btn_asset_group_bulk_update{% endblock %}

apps/assets/templates/assets/_asset_list_modal.html

@@ -1,224 +0,0 @@
-{% extends '_modal.html' %}
-{% load i18n %}
-{% load static %}
-
-{% block modal_class %}modal-lg{% endblock %}
-{% block modal_id %}asset_list_modal{% endblock %}
-{% block modal_title%}{% trans "Asset list" %}{% endblock %}
-{% block modal_body %}
-<link href="{% static 'css/plugins/ztree/awesomeStyle/awesome.css' %}" rel="stylesheet">
-<script type="text/javascript" src="{% static 'js/plugins/ztree/jquery.ztree.all.min.js' %}"></script>
-<script src="{% static 'js/jquery.form.min.js' %}"></script>
-<style>
-.inmodal .modal-header {
-    padding: 10px 10px;
-    text-align: center;
-}
-
-#asset_modal_tree.ztree * {
-    background-color: white;
-}
-#asset_modal_tree.ztree {
-    background-color: white;
-}
-</style>
-
-<div class="wrapper wrapper-content">
-   <div class="row">
-       <div class="col-sm-3" id="split-left" style="padding-left: 3px;overflow: auto;max-height: 500px">
-           <div class="ibox float-e-margins">
-               <div class="ibox-content mailbox-content" style="padding-top: 0;padding-left: 1px">
-                   <div class="file-manager ">
-                       <div id="asset_modal_tree" class="ztree">
-                           {% trans 'Loading' %} ...
-                       </div>
-                       <div class="clearfix"></div>
-                   </div>
-               </div>
-           </div>
-       </div>
-       <div class="col-sm-9 animated fadeInRight" id="split-right">
-           <div class="mail-box-header">
-               <table class="table table-striped table-bordered table-hover " id="asset_list_modal_table" style="width: 100%">
-                   <thead>
-                       <tr>
-                           <th class="text-center"><input type="checkbox" class="ipt_check_all"></th>
-                           <th class="text-center">{% trans 'Hostname' %}</th>
-                           <th class="text-center">{% trans 'IP' %}</th>
-                       </tr>
-                   </thead>
-                   <tbody>
-                   </tbody>
-               </table>
-           </div>
-       </div>
-   </div>
-</div>
-
-<script>
-function syncTableSelectedAssetToSelect2(table) {
-    var assets = table.selected;
-    var options = [];
-    var select2Id = assetModalOption.select2Id;
-    $(select2Id + ' option').each(function (i, v) {
-        options.push(v.value)
-    });
-    table.selected_rows.forEach(function (i) {
-        var name = i.hostname + '(' + i.ip + ')';
-        var option = new Option(name, i.id, false, true);
-
-        if (options.indexOf(i.id) === -1) {
-            $(select2Id).append(option).trigger('change');
-        }
-    });
-    $(select2Id).val(assets).trigger('change');
-}
-
-
-
-// 解决input框中的资产和弹出表格中资产的显示不一致
-function syncSelectedAssetsToModalTable(assetModalTable) {
-    var select2Id = assetModalOption.select2Id;
-    var inputAssets = $(select2Id).val();
-    var selectedAssets = assetModalTable.selected.concat();
-
-    // input assets无，table assets选中，则取消勾选(再次click)
-    if (selectedAssets.length !== 0) {
-        $.each(selectedAssets, function (index, assetId) {
-            if ($.inArray(assetId, inputAssets) === -1) {
-                $('#' + assetId).trigger('click');  // 取消勾选
-            }
-        });
-    }
-
-    // input assets有，table assets没选，则选中(click)
-    if (inputAssets) {
-        assetModalTable.selected = inputAssets;
-        $.each(inputAssets, function (index, assetId) {
-            var dom = document.getElementById(assetId);
-            if (dom !== null) {
-                var selected = dom.parentElement.parentElement.className.indexOf('selected')
-            }
-            if (selected === -1) {
-                $('#' + assetId).trigger('click');
-            }
-        });
-    }
-}
-
-defaultOnAssetModalConfirm = syncTableSelectedAssetToSelect2;
-defaultOnModalTableDone = syncSelectedAssetsToModalTable;
-
-
-var assetModalOption = {
-    selectStyle: 'multi',
-    select2Id: '#id_assets',
-    onModalTableDone: defaultOnModalTableDone,
-    onModalTreeDone: null,
-    onModalConfirm: defaultOnAssetModalConfirm,
-};
-
-var assetModalTable, assetModalTree = null;
-
-function initAssetModalTable() {
-    if(assetModalTable){
-        return
-    }
-    if (assetModalOption.selectStyle === 'single') {
-        $('.ipt_check_all').addClass('hidden')
-    }
-    var options = {
-        ele: $('#asset_list_modal_table'),
-        ajax_url: '{% url "api-assets:asset-list" %}?show_current_asset=1',
-        columns: [
-            {data: "id"}, {data: "hostname" }, {data: "ip" }
-        ],
-        lengthMenu: [[10, 25, 50], [10, 25, 50]],
-        pageLength: 10,
-        select_style: assetModalOption.selectStyle,
-        paging_numbers_length: 3
-    };
-    assetModalTable = jumpserver.initServerSideDataTable(options);
-    if (assetModalOption.onModalTableDone) {
-        assetModalOption.onModalTableDone(assetModalTable);
-    }
-    return assetModalTable
-}
-
-function onModalTreeNodeSelected(event, treeNode) {
-    var url = assetModalTable.ajax.url();
-    url = setUrlParam(url, "node_id", treeNode.meta.node.id);
-    url = setUrlParam(url, "show_current_asset", "");
-    assetModalTable.ajax.url(url);
-    assetModalTable.ajax.reload();
-}
-
-
-function initModalTree() {
-    var url = '{% url 'api-assets:node-children-tree' %}?assets=0';
-    var setting = {
-        view: {
-            dblClickExpand: false,
-            showLine: true
-        },
-        data: {
-            simpleData: {
-                enable: true
-            }
-        },
-        async: {
-			enable: true,
-			url: url,
-			autoParam: ["id=key", "name=n", "level=lv"],
-            type: 'get'
-		},
-        callback: {
-            onSelected: onModalTreeNodeSelected
-        }
-    };
-    $.get(url, function(data, status){
-        $.fn.zTree.init($("#asset_modal_tree"), setting);
-        assetModalTree = $.fn.zTree.getZTreeObj("assetTree2");
-        if (assetModalOption.onModalTreeDone) {
-            assetModalOption.onModalTreeDone(assetModalTree);
-        }
-        return assetModalTree;
-    });
-}
-
-function setAssetModalOptions(options) {
-    assetModalOption = options;
-}
-
-function initAssetTreeModel(selector) {
-    $(selector).parent().find(".select2-selection").on('click', function (e) {
-        if ($(e.target).attr('class') !== 'select2-selection__choice__remove'){
-            e.preventDefault();
-            e.stopPropagation();
-            $("#asset_list_modal").modal();
-        }
-    })
-}
-
-
-$(document).ready(function(){
-
-}).on('show.bs.modal', function () {
-    initAssetModalTable();
-    initModalTree();
-}).on('click', '#btn_asset_modal_confirm', function () {
-    if (assetModalOption.onModalConfirm) {
-        assetModalOption.onModalConfirm(assetModalTable, assetModalTree);
-    }
-    $("#asset_list_modal").modal('hide');
-})
-</script>
-{% endblock %}
-
-{% block modal_button %}
-    {{ block.super }}
-{% endblock %}
-{% block modal_confirm_id %}btn_asset_modal_confirm{% endblock %}
-
-
-

apps/assets/templates/assets/_asset_user_auth_update_modal.html

@@ -1,87 +0,0 @@
-{% extends '_modal.html' %}
-{% load i18n %}
-{% block modal_id %}asset_user_auth_update_modal{% endblock %}
-{% block modal_title%}{% trans "Update asset user auth" %}{% endblock %}
-{% block modal_body %}
-<form class="form-horizontal" role="form" onkeydown="if(event.keyCode==13){ $('#btn_asset_user_auth_update_modal_confirm').trigger('click'); return false;}">
-    {% csrf_token %}
-    <div class="form-group">
-        <label class="col-sm-2 control-label">{% trans "Hostname" %}: </label>
-        <div class="col-sm-10">
-            <p class="form-control-static" id="id_hostname_p"></p>
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="col-sm-2 control-label">{% trans "Username" %}: </label>
-        <div class="col-sm-10">
-            <p class="form-control-static" id="id_username_p"></p>
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="col-sm-2 control-label">{% trans "Password" %}: </label>
-        <div class="col-sm-10">
-            <input class="form-control" id="id_password_auth" type="password" name="password" placeholder="{% trans 'Please input password' %}"/>
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="col-sm-2 control-label">{% trans "Private key" %}: </label>
-        <div class="col-sm-10">
-            <div class="row bootstrap3-multi-input">
-                <div class="col-xs-12">
-                    <input id="id_private_key" type="file" name="private_key"/>
-                </div>
-            </div>
-        </div>
-    </div>
-</form>
-<script>
-var authHostname, authUsername, authAssetId = null;
-
-$(document).ready(function () {
-
-}).on("show.bs.modal", "#asset_user_auth_update_modal", function () {
-    $('#id_hostname_p').html(authHostname);
-    $('#id_username_p').html(authUsername);
-    $('#id_password_auth').parent().removeClass('has-error');
-    $('#id_password_auth').val('');
-}).on('click', '#btn_asset_user_auth_update_modal_confirm', function(){
-    var password = $('#id_password_auth').val();
-    var privateKey = $('#id_private_key').prop('files');
-    var hasPrivateKey = privateKey.length > 0;
-    if (!password && !hasPrivateKey) {
-        $('#id_password_auth').parent().addClass('has-error');
-        return
-    }
-    var data = {
-        'asset': authAssetId,
-        'username': authUsername
-    };
-    if (password) {
-        data["password"] = password
-    }
-    var props = {
-        data: data,
-        url: "{% url 'api-assets:asset-user-list' %}",
-        form: $("form"),
-        method: 'POST',
-        success: function () {
-            toastr.success("{% trans 'Update successfully!' %}");
-            $("#asset_user_auth_update_modal").modal('hide');
-        }
-    };
-    if (hasPrivateKey) {
-        var reader = new FileReader();//新建一个FileReader
-        reader.readAsText(privateKey[0], "UTF-8");//读取文件
-        reader.onload = function(evt){ //读取完文件之后会回来这里
-            data["private_key"] = evt.target.result;
-            formSubmit(props);
-        }
-    }
-    if (!hasPrivateKey) {
-        formSubmit(props);
-    }
-})
-
-</script>
-{% endblock %}
-{% block modal_confirm_id %}btn_asset_user_auth_update_modal_confirm{% endblock %}

apps/assets/templates/assets/_asset_user_auth_view_modal.html

@@ -1,102 +0,0 @@
-{% extends '_modal.html' %}
-{% load i18n %}
-{% load static %}
-{% block modal_id %}asset_user_auth_view{% endblock %}
-{% block modal_title%}{% trans "Asset user auth" %}{% endblock %}
-{% block modal_body %}
-<style>
-    .inmodal .modal-body {
-        background: #fff;
-    }
-</style>
-<form class="form-horizontal" action="" style="padding-top: 20px">
-<div class="auth-field">
-    <div class="form-group">
-        <label for="" class="col-sm-2 control-label">{% trans 'Hostname' %}:</label>
-        <div class="col-sm-8">
-            <p class="form-control-static" id="id_hostname_view"></p>
-        </div>
-    </div>
-    <div class="form-group">
-        <label for="" class="col-sm-2 control-label">{% trans 'Username' %}:</label>
-        <div class="col-sm-8" >
-            <p class="form-control-static" id="id_username_view"></p>
-        </div>
-    </div>
-    <div class="form-group">
-        <label for="" class="col-sm-2 control-label">{% trans 'Password' %}:</label>
-        <div class="col-sm-8">
-            <input id="id_password_view" type="password" class="form-control" value="" readonly style="border: none;padding-left: 0;background-color: #fff;width: 100%">
-        </div>
-        <div class="col-sm-2" style="padding-left: 2px">
-            <a class="btn btn-white btn-sm btn-show-password"><i class="fa fa-eye"></i></a>
-            <a class="btn btn-white btn-sm btn-copy-password"><i class="fa fa-copy"></i></a>
-        </div>
-    </div>
-</div>
-</form>
-<script src="{% static "js/plugins/clipboard/clipboard.min.js" %}"></script>
-<script>
-var showPassword = false;
-var authHostname = "";
-var authUsername = "";
-var mfaFor = "";
-var authUid = "";
-var authInfoDetailUrl = "{% url "api-assets:asset-user-auth-info-detail" pk=DEFAULT_PK %}";
-
-function initClipboard() {
-    var clipboard = new Clipboard('.btn-copy-password', {
-        text: function (trigger) {
-            return $("#id_password_view").val()
-        }
-    });
-    clipboard.on("success", function (e) {
-        toastr.success("{% trans "Copy success" %}")
-    })
-}
-
-function showAuth() {
-    var url = authInfoDetailUrl.replace("{{ DEFAULT_PK }}", authUid);
-    $("#id_username_view").html(authUsername);
-    $("#id_hostname_view").html(authHostname);
-    $("#id_password_view").val('');
-    var success = function (data) {
-        var password = data.password;
-        $("#id_password_view").val(password);
-    };
-    var error = function() {
-        var msg = "{% trans 'Get auth info error' %}";
-        toastr.error(msg)
-    };
-    requestApi({
-        url: url,
-        method: "GET",
-        success: success,
-        flash_message: false,
-        error: error
-    })
-}
-
-$(document).ready(function () {
-    initClipboard();
-}).on("click", ".btn-show-password", function () {
-    showPassword = !showPassword;
-    if (showPassword) {
-        $("#id_password_view").attr("type", "text")
-    } else {
-        $("#id_password_view").attr("type", "password")
-    }
-}).on("show.bs.modal", "#asset_user_auth_view", function () {
-    showPassword = false;
-    $("#id_password_view").attr("type", "password");
-    showAuth();
-}).on("hide.bs.modal", "#asset_user_auth_view", function () {
-    $("#id_username_view").html('');
-    $("#id_hostname_view").html('');
-    $("#id_password_view").val('');
-})
-</script>
-{% endblock %}
-{% block modal_button %}
-  <button data-dismiss="modal" class="btn btn-white close_btn2" type="button">{% trans "Close" %}</button>
-{% endblock %}

apps/assets/templates/assets/_asset_user_list.html

@@ -1,188 +0,0 @@
-{% load i18n %}
-<style>
-    .btn-group>.btn+.dropdown-toggle {
-        padding-right: 4px;
-        padding-left: 4px;
-    }
-
-    table.dataTable tbody tr.selected a {
-        color: rgb(103, 106, 108);;
-    }
-</style>
-
-<table class="table table-striped table-bordered table-hover" id="asset_user_list_table" style="width: 100%">
-  <thead>
-  <tr>
-      <th class="text-center">
-        <input type="checkbox" id="check_all" class="ipt_check_all" >
-      </th>
-      <th class="text-center">{% trans 'Hostname' %}</th>
-      <th class="text-center">{% trans 'IP' %}</th>
-      <th class="text-center">{% trans 'Username' %}</th>
-      <th class="text-center">{% trans 'Version' %}</th>
-{#      <th class="text-center">{% trans 'Connectivity'%}</th>#}
-      <th class="text-center">{% trans 'Datetime' %}</th>
-      <th class="text-center">{% trans 'Action' %}</th>
-   </tr>
-  </thead>
-  <tbody>
-  </tbody>
-</table>
-{% include 'assets/_asset_user_auth_update_modal.html' %}
-{% include 'assets/_asset_user_auth_view_modal.html' %}
-{% include 'authentication/_mfa_confirm_modal.html' %}
-
-<script>
-var defaultAssetUserListUrl = "{% url "api-assets:asset-user-list" %}";
-var defaultAssetUserDetail = "{% url "api-assets:asset-user-detail" pk=DEFAULT_PK %}";
-var assetUserTable;
-var defaultNeedPush = false;
-var lastMFATime = "{{ request.session.MFA_VERIFY_TIME }}";
-var testDatetime = "{% trans 'Test datetime: ' %}";
-var mfaVerifyTTL = "{{ SECURITY_MFA_VERIFY_TTL }}";
-var mfaNeedCheck = "{{ SECURITY_VIEW_AUTH_NEED_MFA }}" === "True";
-var onlyLatestEl = "<span style='padding-right:20px'><input type='checkbox' id='only_latest'> {% trans 'Only latest version' %}</span>";
-var onlyLatestChecked = false;
-var systemUserId = "";
-
-function initAssetUserTable(option) {
-    if (!option) {
-        option = {}
-    }
-    var assetUserListUrl = option.assetUserListUrl || defaultAssetUserListUrl;
-    var needPush = option.needPush === undefined ? defaultNeedPush : option.needPush;
-    var options = {
-        ele: $('#asset_user_list_table'),
-        toggle: true,
-        columnDefs: [
-            {
-                targets: 5, createdCell: function (td, cellData) {
-                    var data = toSafeLocalDateStr(cellData);
-                    $(td).html(data);
-                },
-            },
-            {
-                targets: 6, createdCell: function (td, cellData, rowData) {
-                    var viewBtn = '<button class="btn btn-xs btn-primary m-l-xs btn-view-auth" DATA>{% trans "View" %}</button>';
-                    var updateBtn = '<li><a class="btn-update-auth" DATA>{% trans 'Update' %}</a></li>';
-                    var testBtn = '<li><a class="btn-test-auth" DATA>{% trans 'Test' %}</a></li>';
-                    var pushBtn = '<li><a class="btn-push-auth" DATA>{% trans 'Push' %}</a></li>';
-                    var delBtn = '<li><a class="btn-del-auth" DATA>{% trans 'Delete' %}</a></li>';
-                    if (!needPush) {
-                        pushBtn = ''
-                    }
-
-                    var data = "data-hostname=hostname123 data-username=username123 data-uid=uid123 data-asset=asset123";
-                    data = data.replaceAll("username123", rowData.username)
-                                     .replaceAll("hostname123", rowData.hostname)
-                                     .replaceAll("uid123", rowData.id)
-                                     .replaceAll("asset123", rowData.asset);
-
-                    var actions = '<div class="btn-group">' + viewBtn +
-                        '             <button data-toggle="dropdown" class="btn btn-primary btn-xs dropdown-toggle">' +
-                        '               <span class="caret"></span>' +
-                        '             </button>' +
-                        '                  <ul class="dropdown-menu">' +
-                                           updateBtn + delBtn + testBtn + pushBtn
-                        '                  </ul>' +
-                        '           </div>';
-                    actions = actions.replaceAll("DATA", data);
-				    $(td).html(actions);
-                },
-                width: '70px'
-            }
-        ],
-        ajax_url: assetUserListUrl,
-        columns: [
-            {data: "id"}, {data: "hostname"}, {data: "ip"},
-            {data: "username"}, {data: "version", orderable: false},
-            {data: "date_created", orderable: false},
-            {data: "asset", orderable: false}
-        ],
-        op_html: $('#actions').html(),
-        lb_html: onlyLatestEl,
-    };
-    assetUserTable = jumpserver.initServerSideDataTable(options);
-    return assetUserTable
-}
-$(document).ready(function(){
-})
-.on('click', '.btn-view-auth', function () {
-    // 通知给view auth modal
-    authAssetId = $(this).data("asset");
-    authHostname = $(this).data("hostname");
-    authUsername = $(this).data('username');
-    authUid = $(this).data("uid");
-    if (!mfaNeedCheck){
-        $("#asset_user_auth_view").modal('show');
-        return
-    }
-    var now = new Date();
-    var nowTime = now.getTime() / 1000;
-    if ( !lastMFATime || nowTime - lastMFATime > mfaVerifyTTL ) {
-        mfaFor = "viewAuth";
-        $("#mfa_auth_confirm").modal("show");
-    } else {
-        $("#asset_user_auth_view").modal('show');
-    }
-})
-.on("success", '#mfa_auth_confirm', function () {
-    if (mfaFor !== "viewAuth") {
-        return
-    }
-    $("#asset_user_auth_view").modal("show");
-})
-.on('click', '.btn-update-auth', function() {
-    authUsername = $(this).data("username") ;
-    authHostname = $(this).data("hostname");
-    authAssetId = $(this).data("asset");
-    $("#asset_user_auth_update_modal").modal('show');
-})
-.on("click", '.btn-test-auth', function () {
-    authUid = $(this).data('uid');
-    var theUrl = "{% url 'api-assets:asset-user-task-create'%}?id={{ DEFAULT_PK }}"
-        .replace("{{ DEFAULT_PK }}", authUid);
-
-    var success = function (data) {
-        var taskId = data.task;
-        showCeleryTaskLog(taskId);
-    };
-    requestApi({
-        url: theUrl,
-        method: 'POST',
-        data: JSON.stringify({action: 'test'}),
-        success: success,
-        flash_message: false
-    });
-})
-.on('click', '.btn-del-auth', function () {
-    var uid = $(this).data("uid");
-    var theUrl = defaultAssetUserDetail.replace("{{ DEFAULT_PK }}", uid);
-    requestApi({
-        url: theUrl,
-        method: "DELETE",
-        success: function () {
-            assetUserTable.ajax.reload(null, false);
-        },
-        success_message: "{% trans 'Delete success' %}"
-    })
-
-})
-.on("change", '#only_latest', function () {
-    var checked = $("#only_latest").is(":checked");
-    if (checked === onlyLatestChecked) {
-        return
-    }
-    var ajaxUrl = assetUserTable.ajax.url();
-    if (checked) {
-        ajaxUrl = setUrlParam(ajaxUrl, 'latest', 1)
-    } else {
-        ajaxUrl = setUrlParam(ajaxUrl, 'latest', 0)
-    }
-    onlyLatestChecked = !onlyLatestChecked;
-    assetUserTable.ajax.url(ajaxUrl);
-    assetUserTable.ajax.reload();
-})
-
-
-</script>

apps/assets/templates/assets/_gateway_test_modal.html

@@ -1,18 +0,0 @@
-{% extends '_modal.html' %}
-{% load i18n %}
-{% block modal_id %}gateway_test{% endblock %}
-{% block modal_title%}{% trans "Test gateway test connection" %}{% endblock %}
-{% block modal_body %}
-{% load bootstrap3 %}
-<form method="post" class="form-horizontal" action="" id="test_gateway_form" style="padding-top: 10px">
-    <div class="form-group">
-        <input id="gateway_id" name="gateway_id" hidden>
-        <label for="port" class="col-sm-2 control-label">{% trans 'SSH Port' %}</label>
-        <div class="col-sm-9" id="select2-container">
-            <input id="ssh_test_port" name="port" class="form-control">
-            <span class="help-block">{% trans 'If use nat, set the ssh real port' %}</span>
-        </div>
-    </div>
-</form>
-{% endblock %}
-{% block modal_confirm_id %}btn_gateway_test{% endblock %}

apps/assets/templates/assets/_node_detail_modal.html

@@ -1,68 +0,0 @@
-{% extends '_modal.html' %}
-{% load i18n %}
-{% load static %}
-<style>
-    .modal-body {
-        background-color: white !important;
-    }
-</style>
-{% block modal_id %}node_detail_modal{% endblock %}
-
-{% block modal_title %}{% trans "Node detail" %}{% endblock %}
-
-
-{% block modal_body %}
-<form class="form-horizontal" action="" style="padding-top: 20px">
-<div>
-    <div class="form-group">
-        <label for="" class="col-sm-2 control-label">{% trans 'ID' %}</label>
-        <div class="col-sm-8">
-            <p class="form-control-static" id="id_node_detail_id_view"></p>
-        </div>
-        <div class="col-sm-2" style="padding-left: 2px">
-            <a class="btn btn-white btn-sm btn-node-detail-copy-id"><i class="fa fa-copy"></i></a>
-        </div>
-    </div>
-    <div class="form-group">
-        <label for="" class="col-sm-2 control-label">{% trans 'Name' %}</label>
-        <div class="col-sm-8" >
-            <p class="form-control-static" id="id_node_detail_name_view"></p>
-        </div>
-    </div>
-    <div class="form-group">
-        <label for="" class="col-sm-2 control-label">{% trans 'Full name' %}</label>
-        <div class="col-sm-8" >
-            <p class="form-control-static" id="id_node_detail_full_name_view"></p>
-        </div>
-    </div>
-    <div class="form-group">
-        <label for="" class="col-sm-2 control-label">{% trans 'Key' %}</label>
-        <div class="col-sm-8">
-            <p class="form-control-static" id="id_node_detail_key_view"></p>
-        </div>
-    </div>
-</div>
-</form>
-<script src="{% static "js/plugins/clipboard/clipboard.min.js" %}"></script>
-<script>
-
-function initClipboard() {
-    var clipboard = new Clipboard('.btn-node-detail-copy-id', {
-        text: function (trigger) {
-            return $("#id_node_detail_id_view").html()
-        }
-    });
-    clipboard.on("success", function (e) {
-        toastr.success("{% trans "Copy success" %}")
-    })
-}
-$(document).ready(function () {
-    initClipboard();
-})
-</script>
-
-{% endblock %}
-
-{% block modal_button %}
-<button data-dismiss="modal" class="btn btn-white" type="button">{% trans "Close" %}</button>
-{% endblock %}

apps/assets/templates/assets/_node_tree.html

@@ -1,339 +0,0 @@
-{% load static %}
-{% load i18n %}
-<link href="{% static 'css/plugins/ztree/awesomeStyle/awesome.css' %}" rel="stylesheet">
-{#    <link href="https://cdn.datatables.net/1.10.19/css/jquery.dataTables.min.css" rel="stylesheet">#}
-<script type="text/javascript" src="{% static 'js/plugins/ztree/jquery.ztree.all.min.js' %}"></script>
-<style type="text/css">
-    div#rMenu {
-        position: absolute;
-        visibility: hidden;
-        text-align: left;
-        {#top: 100%;#}
-        top: 0;
-        left: 0;
-        z-index: 999;
-        {#float: left;#}
-        padding: 0 0;
-        margin: 2px 0 0;
-        list-style: none;
-        background-clip: padding-box;
-     }
-    .dataTables_wrapper .dataTables_processing {
-        opacity: .9;
-        border: none;
-    }
-    div#rMenu li{
-        margin: 1px 0;
-        cursor: pointer;
-        list-style: none outside none;
-     }
-    .dropdown a:hover {
-        background-color: #f1f1f1
-    }
-</style>
-
-<div class="ibox treebox float-e-margins" style="overflow:auto;">
-   <div class="ibox-content mailbox-content" style="padding-top: 0;padding-left: 1px">
-       <div class="file-manager" id="tree-node-id">
-           <div id="{% block treeID %}nodeTree{% endblock %}" class="ztree">
-           {% trans 'Loading' %} ...
-           </div>
-           <div class="clearfix"></div>
-       </div>
-   </div>
-</div>
-
-<div id="rMenu">
-    <ul class="dropdown-menu menu-actions">
-        <li class="divider"></li>
-        <li id="m_create" tabindex="-1" onclick="addTreeNode();"><a><i class="fa fa-plus-square-o"></i> {% trans 'Add node' %}</a></li>
-        <li id="m_del" tabindex="-1" onclick="editTreeNode();"><a><i class="fa fa-pencil-square-o"></i> {% trans 'Rename node' %}</a></li>
-        <li id="m_del" tabindex="-1" onclick="removeTreeNode();"><a><i class="fa fa-minus-square"></i> {% trans 'Delete node' %}</a></li>
-    </ul>
-</div>
-<script>
-var zTree, rMenu = null;
-var current_node_id = null;
-var current_node = null;
-var showMenu = false;
-
-
-var treeUrl = '{% url 'api-assets:node-children-tree' %}?assets=0';
-// options:
-//    {
-//       "onSelected": func,
-//       "showAssets": false,
-//       "beforeAsync": func()
-//       "showMenu": false,
-//       "otherMenu": "",
-//       "showAssets": false,
-//    }
-var inited = false;
-function initNodeTree(options) {
-    if (options.showAssets) {
-        treeUrl = setUrlParam(treeUrl, 'assets', '1')
-    }
-    var setting = {
-        view: {
-            dblClickExpand: false,
-            showLine: true
-        },
-        data: {
-            simpleData: {
-                enable: true
-            }
-        },
-        async: {
-			enable: true,
-			url: treeUrl,
-			autoParam: ["id=key", "name=n", "level=lv"],
-            type: 'get'
-		},
-        edit: {
-            enable: true,
-			showRemoveBtn: false,
-			showRenameBtn: false,
-            drag: {
-                isCopy: true,
-                isMove: true
-            }
-        },
-        callback: {
-            onRightClick: OnRightClick,
-            beforeClick: beforeClick,
-            onRename: onRename,
-            onSelected: options.onSelected || defaultCallback("On selected"),
-            beforeDrag: beforeDrag,
-            onDrag: onDrag,
-            beforeDrop: beforeDrop,
-            onDrop: onDrop,
-            beforeAsync: options.beforeAsync || defaultCallback("Before async")
-        }
-    };
-    $.get(treeUrl, function (data, status) {
-        zTree = $.fn.zTree.init($("#nodeTree"), setting, data);
-        rootNodeAddDom(zTree, function () {
-            const url = '{% url 'api-assets:node-task-create' pk=DEFAULT_PK %}';
-            requestApi({
-                url: url,
-                method: 'POST',
-                data: {action: "refresh_cache"},
-                flash_message: false,
-                success: function () {
-                    initNodeTree(options);
-                }
-            });
-        });
-        inited = true;
-    });
-
-    if (inited) {
-        return
-    }
-
-    if (options.showMenu) {
-        showMenu = true;
-        rMenu = $("#rMenu");
-    }
-    if (options.otherMenu) {
-        $(".menu-actions").append(options.otherMenu)
-    }
-    return zTree
-}
-
-function addTreeNode() {
-	hideRMenu();
-	var parentNode = zTree.getSelectedNodes()[0];
-	if (!parentNode){
-	    return
-    }
-    var url = "{% url 'api-assets:node-children' pk=DEFAULT_PK %}".replace("{{ DEFAULT_PK }}", parentNode.meta.node.id);
-    $.post(url,  {}, function (data, status){
-        if (status === "success") {
-            var newNode = {
-                id: data["key"],
-                name: data["value"],
-                pId: parentNode.id,
-                meta: {
-                    "node": data
-                }
-            };
-            newNode.checked = zTree.getSelectedNodes()[0].checked;
-            zTree.addNodes(parentNode, 0, newNode);
-            var node = zTree.getNodeByParam('id', newNode.id, parentNode);
-            zTree.editName(node);
-        } else {
-            alert("{% trans 'Create node failed' %}")
-        }
-    });
-}
-
-function removeTreeNode() {
-	hideRMenu();
-	var current_node = zTree.getSelectedNodes()[0];
-	if (!current_node){
-	    return
-    }
-    var url = "{% url 'api-assets:node-detail' pk=DEFAULT_PK %}".replace("{{ DEFAULT_PK }}", current_node_id);
-    requestApi({
-        url: url,
-        method: "DELETE",
-        success: function () {
-            zTree.removeNode(current_node)
-        }
-    })
-}
-
-function editTreeNode() {
-    hideRMenu();
-    var current_node = zTree.getSelectedNodes()[0];
-    if (!current_node){
-        return
-    }
-    if (current_node) {
-        current_node.name = current_node.meta.node.value;
-    }
-    zTree.editName(current_node);
-}
-
-function OnRightClick(event, treeId, treeNode) {
-    if (!showMenu) {
-        return
-    }
-    if (!treeNode && event.target.tagName.toLowerCase() !== "button" && $(event.target).parents("a").length === 0) {
-		zTree.cancelSelectedNode();
-		showRMenu("root", event.clientX, event.clientY);
-	} else if (treeNode && !treeNode.noR) {
-		zTree.selectNode(treeNode);
-		showRMenu("node", event.clientX, event.clientY);
-	}
-}
-
-function showRMenu(type, x, y) {
-    var offset = $("#tree-node-id").offset();
-    var scrollTop = document.querySelector('.treebox').scrollTop;
-    x -= offset.left;
-    y -= offset.top + scrollTop;
-    x += document.body.scrollLeft;
-    y += document.body.scrollTop + document.documentElement.scrollTop;
-    rMenu.css({"top":y+"px", "left":x+"px", "visibility":"visible"});
-    $("#rMenu ul").show();
-	$("body").bind("mousedown", onBodyMouseDown);
-}
-
-function beforeClick(treeId, treeNode, clickFlag) {
-    return true;
-}
-
-function hideRMenu() {
-	if (rMenu) rMenu.css({"visibility": "hidden"});
-	$("body").unbind("mousedown", onBodyMouseDown);
-}
-
-function onBodyMouseDown(event){
-	if (!(event.target.id === "rMenu" || $(event.target).parents("#rMenu").length>0)) {
-		rMenu.css({"visibility" : "hidden"});
-	}
-}
-
-function onRename(event, treeId, treeNode, isCancel){
-    var url = "{% url 'api-assets:node-detail' pk=DEFAULT_PK %}"
-        .replace("{{ DEFAULT_PK }}", current_node_id);
-    var data = {"value": treeNode.name};
-    if (isCancel){
-        return
-    }
-    requestApi({
-        url: url,
-        body: JSON.stringify(data),
-        method: "PATCH",
-        success_message: "{% trans 'Rename success' %}",
-        success: function () {
-            var assets_amount = treeNode.meta.node.assets_amount;
-            if (!assets_amount) {
-                assets_amount = 0;
-            }
-            treeNode.name = treeNode.name + ' (' + assets_amount + ')';
-            zTree.updateNode(treeNode);
-        },
-    })
-}
-
-
-function beforeDrag() {
-    return true
-}
-
-function beforeDrop(treeId, treeNodes, targetNode, moveType) {
-    var treeNodesNames = [];
-    $.each(treeNodes, function (index, value) {
-        treeNodesNames.push(value.name);
-    });
-
-    var msg = "你想移动节点: `" + treeNodesNames.join(",") + "` 到 `" + targetNode.name + "` 下吗?";
-    return confirm(msg);
-}
-
-function onDrag(event, treeId, treeNodes) {
-}
-
-function onDrop(event, treeId, treeNodes, targetNode, moveType) {
-    var treeNodesIds = [];
-    $.each(treeNodes, function (index, value) {
-        treeNodesIds.push(value.meta.node.id);
-    });
-
-    var the_url = "{% url 'api-assets:node-add-children' pk=DEFAULT_PK %}".replace("{{ DEFAULT_PK }}", targetNode.meta.node.id);
-    var body = {nodes: treeNodesIds};
-    requestApi({
-        url: the_url,
-        method: "PUT",
-        body: JSON.stringify(body)
-    })
-}
-
-function defaultCallback(action) {
-    function logging() {
-        console.log(action)
-    }
-    return logging
-}
-
-function toggle() {
-    if (show === 0) {
-        $("#split-left").hide(500, function () {
-            $("#split-right").attr("class", "col-lg-12");
-            $("#toggle-icon").attr("class", "fa fa-angle-right fa-x");
-            show = 1;
-        });
-    } else {
-        $("#split-right").attr("class", "col-lg-9");
-        $("#toggle-icon").attr("class", "fa fa-angle-left fa-x");
-        $("#split-left").show(500);
-        show = 0;
-    }
-}
-
-
-$(document).ready(function () {
-    $('.treebox').css('height', window.innerHeight - 60);
-})
-.on('click', '.btn-show-current-asset', function(){
-    hideRMenu();
-    $(this).css('display', 'none');
-    $('#show_all_asset').css('display', 'inline-block');
-    setCookie('show_current_asset', '1');
-    location.reload()
-})
-.on('click', '.btn-show-all-asset', function(){
-    hideRMenu();
-    $(this).css('display', 'none');
-    $('#show_current_asset').css('display', 'inline-block');
-    setCookie('show_current_asset', '');
-    location.reload();
-}).on('click', '.tree-toggle-btn', function (e) {
-    e.preventDefault();
-    toggle();
-})
-
-</script>

apps/assets/templates/assets/_system_user.html

@@ -1,282 +0,0 @@
-{% extends 'base.html' %}
-{% load i18n %}
-{% load static %}
-{% load bootstrap3 %}
-
-{% block content %}
-    <div class="wrapper wrapper-content animated fadeInRight">
-        <div class="row">
-            <div class="col-sm-12">
-                <div class="ibox float-e-margins">
-                    <div class="ibox-title">
-                        <h5>{{ action }}</h5>
-                        <div class="ibox-tools">
-                            <a class="collapse-link">
-                                <i class="fa fa-chevron-up"></i>
-                            </a>
-                            <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-                                <i class="fa fa-wrench"></i>
-                            </a>
-                            <a class="close-link">
-                                <i class="fa fa-times"></i>
-                            </a>
-                        </div>
-                    </div>
-                    <div class="ibox-content">
-                        <form enctype="multipart/form-data" method="post" class="form-horizontal" action="" >
-                            {% csrf_token %}
-                            {% if form.non_field_errors %}
-                                <div class="alert alert-danger">
-                                    {{ form.non_field_errors }}
-                                </div>
-                            {% endif %}
-                            <h3>{% trans 'Basic' %}</h3>
-                            {% bootstrap_field form.name layout="horizontal" %}
-                            {% bootstrap_field form.login_mode layout="horizontal" %}
-                            {% bootstrap_field form.username layout="horizontal" %}
-                            {% bootstrap_field form.username_same_with_user layout="horizontal" %}
-                            {% bootstrap_field form.priority layout="horizontal" %}
-                            {% bootstrap_field form.protocol layout="horizontal" %}
-
-                            <h3 id="auth_title_id">{% trans 'Auth' %}</h3>
-                            {% block auth %}
-                            <div class="auto-generate">
-                                <div class="form-group">
-                                    <label for="{{ form.auto_generate_key.id_for_label }}" class="col-sm-2 control-label">{% trans 'Auto generate key' %}</label>
-                                    <div class="col-sm-8">
-                                        {{ form.auto_generate_key}}
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="auth-fields">
-                                {% bootstrap_field form.password layout="horizontal" %}
-                                {% bootstrap_field form.private_key layout="horizontal" %}
-                            </div>
-                            <div class="form-group">
-                                <label for="{{ form.auto_push.id_for_label }}" class="col-sm-2 control-label">{% trans 'Auto push' %}</label>
-                                <div class="col-sm-8">
-                                    {{ form.auto_push}}
-                                </div>
-                            </div>
-                            {% endblock %}
-                            <div id="command-filter-block">
-                                <h3>{% trans 'Command filter' %}</h3>
-                                {% bootstrap_field form.cmd_filters layout="horizontal" %}
-                            </div>
-                            <h3>{% trans 'Other' %}</h3>
-                            {% bootstrap_field form.sftp_root layout="horizontal" %}
-                            {% bootstrap_field form.sudo layout="horizontal" %}
-                            {% bootstrap_field form.shell layout="horizontal" %}
-                            {% bootstrap_field form.comment layout="horizontal" %}
-                            <div class="form-group">
-                                <div class="col-sm-4 col-sm-offset-2">
-                                    <button class="btn btn-white" type="reset">{% trans 'Reset' %}</button>
-                                    <button id="submit_button" class="btn btn-primary" type="submit">{% trans 'Submit' %}</button>
-                                </div>
-                            </div>
-                        </form>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-{% endblock %}
-{% block custom_foot_js %}
-<script>
-var protocol_id = '#' + '{{ form.protocol.id_for_label }}';
-var login_mode_id = '#' + '{{ form.login_mode.id_for_label }}';
-
-var auto_generate_key = '#'+'{{ form.auto_generate_key.id_for_label }}';
-var password_id = '#' + '{{ form.password.id_for_label }}';
-var private_key_id = '#' + '{{ form.private_key.id_for_label }}';
-var auto_push_id = '#' + '{{ form.auto_push.id_for_label }}';
-var command_filter_block_id = '#command-filter-block';
-var sudo_id = '#' + '{{ form.sudo.id_for_label }}';
-var shell_id = '#' + '{{ form.shell.id_for_label }}';
-
-function autoLoginModeProtocol() {
-    // 协议+自动登录模式字段控制
-    $('#auth_title_id').removeClass('hidden');
-    var protocol = $(protocol_id + " option:selected").text();
-    if (['rdp'].indexOf(protocol) !== -1) {
-        authFieldsDisplay();
-        $(auto_generate_key).closest('.form-group').removeClass('hidden');
-        $(private_key_id).closest('.form-group').addClass('hidden');
-        $(password_id).closest('.form-group').removeClass('hidden');
-        $(auto_push_id).closest('.form-group').removeClass('hidden');
-        $(command_filter_block_id).addClass('hidden');
-        $(sudo_id).closest('.form-group').addClass('hidden');
-        $(shell_id).closest('.form-group').addClass('hidden');
-    }
-    else if (protocol === 'vnc') {
-        $('.auth-fields').removeClass('hidden');
-        $(auto_generate_key).closest('.form-group').addClass('hidden');
-        $(private_key_id).closest('.form-group').addClass('hidden');
-        $(password_id).closest('.form-group').removeClass('hidden');
-        $(auto_push_id).closest('.form-group').addClass('hidden');
-        $(command_filter_block_id).addClass('hidden');
-        $(sudo_id).closest('.form-group').addClass('hidden');
-        $(shell_id).closest('.form-group').addClass('hidden');
-    }
-    else if (protocol === 'mysql'){
-        $('.auth-fields').removeClass('hidden');
-        $(auto_generate_key).closest('.form-group').addClass('hidden');
-        $(private_key_id).closest('.form-group').addClass('hidden');
-        $(password_id).closest('.form-group').removeClass('hidden');
-        $(auto_push_id).closest('.form-group').addClass('hidden');
-        $(command_filter_block_id).removeClass('hidden');
-        $(sudo_id).closest('.form-group').addClass('hidden');
-        $(shell_id).closest('.form-group').addClass('hidden');
-    }
-    else if (protocol === 'telnet') {
-        $('.auth-fields').removeClass('hidden');
-        $(auto_generate_key).closest('.form-group').addClass('hidden');
-        $(private_key_id).closest('.form-group').addClass('hidden');
-        $(password_id).closest('.form-group').removeClass('hidden');
-        $(auto_push_id).closest('.form-group').addClass('hidden');
-        $(command_filter_block_id).removeClass('hidden');
-        $(sudo_id).closest('.form-group').addClass('hidden');
-        $(shell_id).closest('.form-group').addClass('hidden');
-    }
-    else {
-        authFieldsDisplay();
-        $(auto_generate_key).closest('.form-group').removeClass('hidden');
-        $(private_key_id).closest('.form-group').removeClass('hidden');
-        $(password_id).closest('.form-group').removeClass('hidden');
-        $(auto_push_id).closest('.form-group').removeClass('hidden');
-        $(command_filter_block_id).removeClass('hidden');
-        $(sudo_id).closest('.form-group').removeClass('hidden');
-        $(shell_id).closest('.form-group').removeClass('hidden');
-    }
-}
-
-function manualLoginModeProtocol() {
-    // 协议+手动登录模式字段控制
-    $('#auth_title_id').addClass('hidden');
-    var protocol = $(protocol_id + " option:selected").text();
-    if (['rdp'].indexOf(protocol) !== -1) {
-        $('.auth-fields').addClass('hidden');
-        $(auto_generate_key).closest('.form-group').addClass('hidden');
-        $(password_id).closest('.form-group').addClass('hidden');
-        $(private_key_id).closest('.form-group').addClass('hidden');
-        $(auto_push_id).closest('.form-group').addClass('hidden');
-        $(command_filter_block_id).addClass('hidden');
-        $(sudo_id).closest('.form-group').addClass('hidden');
-        $(shell_id).closest('.form-group').addClass('hidden');
-    }
-    else if (protocol === 'vnc'){
-        $('.auth-fields').addClass('hidden');
-        $(auto_generate_key).closest('.form-group').addClass('hidden');
-        $(password_id).closest('.form-group').addClass('hidden');
-        $(private_key_id).closest('.form-group').addClass('hidden');
-        $(auto_push_id).closest('.form-group').addClass('hidden');
-        $(command_filter_block_id).addClass('hidden');
-        $(sudo_id).closest('.form-group').addClass('hidden');
-        $(shell_id).closest('.form-group').addClass('hidden');
-    }
-    else if (protocol === 'mysql'){
-        $('.auth-fields').addClass('hidden');
-        $(auto_generate_key).closest('.form-group').addClass('hidden');
-        $(password_id).closest('.form-group').addClass('hidden');
-        $(private_key_id).closest('.form-group').addClass('hidden');
-        $(auto_push_id).closest('.form-group').addClass('hidden');
-        $(command_filter_block_id).removeClass('hidden');
-        $(sudo_id).closest('.form-group').addClass('hidden');
-        $(shell_id).closest('.form-group').addClass('hidden');
-    }
-    else if (protocol === 'telnet') {
-        $('.auth-fields').addClass('hidden');
-        $(auto_generate_key).closest('.form-group').addClass('hidden');
-        $(password_id).closest('.form-group').addClass('hidden');
-        $(private_key_id).closest('.form-group').addClass('hidden');
-        $(auto_push_id).closest('.form-group').addClass('hidden');
-        $(command_filter_block_id).removeClass('hidden');
-        $(sudo_id).closest('.form-group').addClass('hidden');
-        $(shell_id).closest('.form-group').addClass('hidden');
-    }
-    else {
-        $('.auth-fields').addClass('hidden');
-        $(auto_generate_key).closest('.form-group').addClass('hidden');
-        $(password_id).closest('.form-group').addClass('hidden');
-        $(private_key_id).closest('.form-group').addClass('hidden');
-        $(auto_push_id).closest('.form-group').addClass('hidden');
-        $(command_filter_block_id).removeClass('hidden');
-        $(sudo_id).closest('.form-group').removeClass('hidden');
-        $(shell_id).closest('.form-group').removeClass('hidden');
-    }
-
-}
-
-function authFieldsDisplay() {
-    if ($(auto_generate_key).prop('checked')) {
-        $('.auth-fields').addClass('hidden');
-    } else {
-        $('.auth-fields').removeClass('hidden');
-    }
-}
-function fieldDisplay(){
-    var login_mode = $(login_mode_id).val();
-    if (login_mode === 'manual'){
-        manualLoginModeProtocol();
-    }
-    else if(login_mode === 'auto'){
-        autoLoginModeProtocol();
-    }
-}
-
-$(document).ready(function () {
-    $('.select2').select2();
-    authFieldsDisplay();
-    fieldDisplay();
-    var checked = $("#id_username_same_with_user").prop('checked');
-    if (checked) {
-        $("#id_username").attr("disabled", true)
-    }
-})
-.on('change', auto_generate_key, function(){
-    authFieldsDisplay();
-})
-.on('change', login_mode_id, function(){
-    fieldDisplay();
-})
-.on('change', protocol_id, function(){
-    fieldDisplay();
-}).on("submit", "form", function (evt) {
-    evt.preventDefault();
-    {% block formUrl %}
-    var the_url = '{% url 'api-assets:system-user-list' %}';
-    var redirect_to = '{% url "assets:system-user-list" %}';
-    var method = "POST";
-    {% endblock %}
-    var form = $("form");
-    var data = form.serializeObject();
-
-    objectAttrsIsList(data, ['cmd_filters']);
-    objectAttrsIsBool(data, ["auto_generate_key", "auto_push", "username_same_with_user"]);
-    data["private_key"] = $("#id_private_key").data('file');
-
-    var props = {
-        url: the_url,
-        data: data,
-        method: method,
-        form: form,
-        redirect_to: redirect_to
-    };
-    formSubmit(props);
-}).on('change', '#id_private_key', function () {
-    readFile($(this)).on("onload", function (evt, data) {
-         $(this).data("file", data)
-    })
-}).on("change", '#id_username_same_with_user', function () {
-    var checked = $(this).prop('checked');
-    var usernameRef = $("#id_username");
-    if (checked) {
-        usernameRef.val('');
-        usernameRef.attr("disabled", true)
-    } else {
-        usernameRef.attr("disabled", false)
-    }
-})
-
-</script>
-{% endblock %}

apps/assets/templates/assets/_user_asset_detail_modal.html

@@ -1,24 +0,0 @@
-{% extends '_modal.html' %}
-{% load i18n %}
-{% load static %}
-<style>
-    .modal-body {
-        background-color: white !important;
-    }
-</style>
-{% block modal_id %}user_asset_detail_modal{% endblock %}
-
-{% block modal_title %}{% trans "Asset detail" %}{% endblock %}
-
-{% block modal_body %}
-    <div class="ibox-content" style="background-color: inherit">
-        <table class="table">
-            <tbody id="asset_detail_tbody">
-            </tbody>
-        </table>
-    </div>
-{% endblock %}
-
-{% block modal_button %}
-<button data-dismiss="modal" class="btn btn-white" type="button">{% trans "Close" %}</button>
-{% endblock %}

apps/assets/templates/assets/admin_user_assets.html

@@ -1,93 +0,0 @@
-{% extends 'base.html' %}
-{% load static %}
-{% load i18n %}
-
-{% block content %}
-    <div class="wrapper wrapper-content animated fadeInRight">
-        <div class="row">
-            <div class="col-sm-12">
-                <div class="ibox float-e-margins">
-                    <div class="panel-options">
-                        <ul class="nav nav-tabs">
-                            <li>
-                                <a href="{% url 'assets:admin-user-detail' pk=admin_user.pk %}" class="text-center"><i class="fa fa-laptop"></i> {% trans 'Detail' %} </a>
-                            </li>
-                            <li class="active">
-                                <a href="{% url 'assets:admin-user-assets' pk=admin_user.pk %}" class="text-center"><i class="fa fa-laptop"></i> {% trans 'Assets list' %} </a>
-                            </li>
-                        </ul>
-                    </div>
-                    <div class="tab-content">
-                        <div class="col-sm-8" style="padding-left: 0;">
-                            <div class="ibox float-e-margins">
-                                <div class="ibox-title">
-                                    <span style="float: left">{% trans 'Asset list of ' %} <b>{{ admin_user.name }}</b></span>
-                                    <div class="ibox-tools">
-                                        <a class="collapse-link">
-                                            <i class="fa fa-chevron-up"></i>
-                                        </a>
-                                        <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-                                            <i class="fa fa-wrench"></i>
-                                        </a>
-                                        <ul class="dropdown-menu dropdown-user">
-                                        </ul>
-                                        <a class="close-link">
-                                            <i class="fa fa-times"></i>
-                                        </a>
-                                    </div>
-                                </div>
-                                <div class="ibox-content">
-                                    {% include 'assets/_asset_user_list.html' %}
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-sm-4" style="padding-left: 0;padding-right: 0">
-                            <div class="panel panel-primary">
-                                <div class="panel-heading">
-                                    <i class="fa fa-info-circle"></i> {% trans 'Quick update' %}
-                                </div>
-                                <div class="panel-body">
-                                    <table class="table">
-                                        <tbody>
-                                        <tr class="no-borders-tr">
-                                            <td width="50%">{% trans 'Test connective' %}:</td>
-                                            <td>
-                                                <span style="float: right">
-                                                    <button type="button" class="btn btn-primary btn-xs btn-test-connective" style="width: 54px">{% trans 'Test' %}</button>
-                                                </span>
-                                            </td>
-                                        </tr>
-                                        </tbody>
-                                    </table>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-{% endblock %}
-{% block custom_foot_js %}
-<script>
-
-$(document).ready(function () {
-	var assetUserListUrl = setUrlParam(defaultAssetUserListUrl, "prefer_id", "{{ admin_user.id }}");
-    assetUserListUrl = setUrlParam(assetUserListUrl, "prefer", "admin_user");
-    initAssetUserTable({assetUserListUrl: assetUserListUrl});
-})
-.on('click', '.btn-test-connective', function () {
-    var the_url = "{% url 'api-assets:admin-user-connective' pk=admin_user.id %}";
-    var success = function (data) {
-        var task_id = data.task;
-        showCeleryTaskLog(task_id);
-    };
-    requestApi({
-        url: the_url,
-        method: 'GET',
-        success: success,
-        flash_message: false
-    });
-})
-</script>
-{% endblock %}

apps/assets/templates/assets/admin_user_create_update.html

@@ -1,86 +0,0 @@
-{% extends 'base.html' %}
-{% load i18n %}
-{% load static %}
-{% load bootstrap3 %}
-
-{% block content %}
-    <div class="wrapper wrapper-content animated fadeInRight">
-        <div class="row">
-            <div class="col-sm-12">
-                <div class="ibox float-e-margins">
-                    <div class="ibox-title">
-                        <h5>{{ action }}</h5>
-                        <div class="ibox-tools">
-                            <a class="collapse-link">
-                                <i class="fa fa-chevron-up"></i>
-                            </a>
-                            <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-                                <i class="fa fa-wrench"></i>
-                            </a>
-                            <a class="close-link">
-                                <i class="fa fa-times"></i>
-                            </a>
-                        </div>
-                    </div>
-                    <div class="ibox-content">
-                        {% if form.non_field_errors %}
-                        <div class="alert alert-danger">
-                            {{ form.non_field_errors }}
-                        </div>
-                        {% endif %}
-                        <form enctype="multipart/form-data" method="post" class="form-horizontal" action="" >
-                            {% csrf_token %}
-                            {% bootstrap_field form.name layout="horizontal" %}
-                            {% bootstrap_field form.username layout="horizontal" %}
-                            {% bootstrap_field form.password layout="horizontal" %}
-                            {% bootstrap_field form.private_key layout="horizontal" %}
-                            {% bootstrap_field form.comment layout="horizontal" %}
-
-                            <div class="form-group">
-                                <div class="col-sm-4 col-sm-offset-2">
-                                    <button class="btn btn-white" type="reset">{% trans 'Reset' %}</button>
-                                    <button id="submit_button" class="btn btn-primary" type="submit">{% trans 'Submit' %}</button>
-                                </div>
-                            </div>
-                        </form>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-{% endblock %}
-{% block custom_foot_js %}
-<script>
-$(document).ready(function () {
-    $('.select2').select2();
-})
-.on("submit", "form", function (evt) {
-    evt.preventDefault();
-    var the_url = '{% url 'api-assets:admin-user-list' %}';
-    var redirect_to = '{% url "assets:admin-user-list" %}';
-    var method = "POST";
-    {% if type == "update" %}
-        the_url = '{% url 'api-assets:admin-user-detail' pk=object.id %}';
-        redirect_to = '{% url "assets:admin-user-list" %}';
-        method = "PUT";
-    {% endif %}
-    var form = $("form");
-    var data = form.serializeObject();
-    data["private_key"] = $("#id_private_key").data('file');
-
-    var props = {
-        url: the_url,
-        data: data,
-        method: method,
-        form: form,
-        redirect_to: redirect_to
-    };
-    formSubmit(props);
-})
-.on('change', '#id_private_key', function () {
-    readFile($(this)).on("onload", function (evt, data) {
-        $(this).data("file", data)
-    })
-})
-</script>
-{% endblock %}

apps/assets/templates/assets/admin_user_detail.html

@@ -1,166 +0,0 @@
-{% extends 'base.html' %}
-{% load static %}
-{% load i18n %}
-
-{% block content %}
-    <div class="wrapper wrapper-content animated fadeInRight">
-        <div class="row">
-            <div class="col-sm-12">
-                <div class="ibox float-e-margins">
-                    <div class="panel-options">
-                        <ul class="nav nav-tabs">
-                            <li class="active">
-                                <a href="{% url 'assets:admin-user-detail' pk=admin_user.pk %}" class="text-center"><i class="fa fa-laptop"></i> {% trans 'Detail' %} </a>
-                            </li>
-                            <li>
-                                <a href="{% url 'assets:admin-user-assets' pk=admin_user.pk %}" class="text-center"><i class="fa fa-laptop"></i> {% trans 'Assets list' %} </a>
-                            </li>
-                            <li class="pull-right">
-                                <a class="btn btn-outline btn-default" href="{% url 'assets:admin-user-update' pk=admin_user.id %}"><i class="fa fa-edit"></i>{% trans 'Update' %}</a>
-                            </li>
-                            <li class="pull-right">
-                                <a class="btn btn-outline btn-danger btn-delete-admin-user">
-                                    <i class="fa fa-trash-o"></i>{% trans 'Delete' %}
-                                </a>
-                            </li>
-                        </ul>
-                    </div>
-                    <div class="tab-content">
-                        <div class="col-sm-8" style="padding-left: 0;">
-                            <div class="ibox float-e-margins">
-                                <div class="ibox-title">
-                                    <span class="label"><b>{{ admin_user.name }}</b></span>
-                                    <div class="ibox-tools">
-                                        <a class="collapse-link">
-                                            <i class="fa fa-chevron-up"></i>
-                                        </a>
-                                        <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-                                            <i class="fa fa-wrench"></i>
-                                        </a>
-                                        <ul class="dropdown-menu dropdown-user">
-                                        </ul>
-                                        <a class="close-link">
-                                            <i class="fa fa-times"></i>
-                                        </a>
-                                    </div>
-                                </div>
-                                <div class="ibox-content">
-                                    <table class="table">
-                                        <tbody>
-                                        <tr class="no-borders-tr">
-                                            <td>{% trans 'Name' %}:</td>
-                                            <td><b>{{ admin_user.name }}</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{% trans 'Username' %}:</td>
-                                            <td><b>{{ admin_user.username }}</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{% trans 'Date created' %}:</td>
-                                            <td><b>{{ admin_user.date_created }}</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{% trans 'Created by' %}:</td>
-                                            <td><b>{{ admin_user.created_by  }}</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{% trans 'Comment' %}:</td>
-                                            <td><b>{{ admin_user.comment }}</b></td>
-                                        </tr>
-                                        </tbody>
-                                    </table>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-sm-4" style="padding-left: 0;padding-right: 0">
-                            <div class="panel panel-primary">
-                                <div class="panel-heading">
-                                    <i class="fa fa-info-circle"></i> {% trans 'Replace node assets admin user with this' %}
-                                </div>
-                                <div class="panel-body">
-                                    <table class="table group_edit" id="table-clusters">
-                                        <tbody>
-                                        <form>
-                                            <tr>
-                                                <td colspan="2" class="no-borders">
-                                                    <select data-placeholder="{% trans 'Select nodes' %}"  id="nodes_selected"  class="nodes-select2" style="width: 100%" multiple="" tabindex="4">
-                                                        {% for node in nodes %}
-                                                        <option value="{{ node.id }}" id="opt_{{ node.id }}" >{{ node.full_value }}</option>
-                                                        {% endfor %}
-                                                    </select>
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                                <td colspan="2" class="no-borders">
-                                                    <button type="button" class="btn btn-primary btn-sm" id="btn-change-admin-user">{% trans 'Confirm' %}</button>
-                                                </td>
-                                            </tr>
-                                        </form>
-                                        </tbody>
-                                    </table>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-    </div>
-
-{% endblock %}
-{% block custom_foot_js %}
-<script>
-function replaceNodeAssetsAdminUser(nodes) {
-    var the_url = "{% url 'api-assets:replace-nodes-admin-user' pk=admin_user.id %}";
-    var body = {
-        nodes: nodes
-    };
-    var success = function(data) {
-        // remove all the selected groups from select > option and rendered ul element;
-        $('.select2-selection__rendered').empty();
-        $('#nodes_selected').val('');
-        $.map(jumpserver.nodes_selected, function(value, index) {
-            $('#opt_' + index).remove();
-        });
-        // clear jumpserver.groups_selected
-        jumpserver.nodes_selected = {};
-    };
-    requestApi({
-        url: the_url,
-        body: JSON.stringify(body),
-        success: success
-    });
-}
-
-jumpserver.nodes_selected = {};
-$(document).ready(function () {
-    nodesSelect2Init(".nodes-select2")
-    .on('select2:select', function(evt) {
-        var data = evt.params.data;
-        jumpserver.nodes_selected[data.id] = data.text;
-    }).on('select2:unselect', function(evt) {
-        var data = evt.params.data;
-        delete jumpserver.nodes_selected[data.id]
-    });
-})
-.on('click', '.btn-delete-admin-user', function () {
-    var $this = $(this);
-    var name = "{{ admin_user.name }}";
-    var uid = "{{ admin_user.id }}";
-    var the_url = '{% url "api-assets:admin-user-detail" pk=DEFAULT_PK %}'.replace('{{ DEFAULT_PK }}', uid);
-    var redirect_url = "{% url 'assets:admin-user-list' %}";
-    objectDelete($this, name, the_url, redirect_url);
-})
-.on('click', '#btn-change-admin-user', function () {
-    if (Object.keys(jumpserver.nodes_selected).length === 0) {
-       return false;
-    }
-    var nodes = [];
-    $.map(jumpserver.nodes_selected, function(value, index) {
-        nodes.push(index);
-    });
-    replaceNodeAssetsAdminUser(nodes);
-})
-</script>
-{% endblock %}

apps/assets/templates/assets/admin_user_list.html

@@ -1,77 +0,0 @@
-{% extends '_base_list.html' %}
-{% load i18n static %}
-{% block help_message %}
-    {% trans 'Admin users are asset (charged server) on the root, or have NOPASSWD: ALL sudo permissions users, '%}
-    {% trans 'JumpServer users of the system using the user to `push system user`,  `get assets hardware information`, etc. '%}
-{% endblock %}
-{% block table_search %}
-    {% include '_csv_import_export.html' %}
-{% endblock %}
-
-{% block table_container %}
-<div class="uc pull-left m-r-5">
-    <a href="{% url "assets:admin-user-create" %}" class="btn btn-sm btn-primary"> {% trans "Create admin user" %} </a>
-</div>
-<table class="table table-striped table-bordered table-hover " id="admin_user_list_table" >
-    <thead>
-    <tr>
-        <th class="text-center">
-            <input type="checkbox" id="check_all" class="ipt_check_all" >
-        </th>
-        <th class="text-center">{% trans 'Name' %}</th>
-        <th class="text-center">{% trans 'Username' %}</th>
-        <th class="text-center">{% trans 'Asset' %}</th>
-        <th class="text-center">{% trans 'Comment' %}</th>
-        <th class="text-center">{% trans 'Action' %}</th>
-    </tr>
-    </thead>
-    <tbody>
-    </tbody>
-</table>
-{% endblock %}
-{% block content_bottom_left %}{% endblock %}
-{% block custom_foot_js %}
-<script>
-var admin_user_table = 0;
-function initTable() {
-    var options = {
-        ele: $('#admin_user_list_table'),
-        columnDefs: [
-            {targets: 1, render: function (cellData, tp, rowData, meta) {
-                cellData = htmlEscape(cellData);
-                var detail_btn = '<a href="{% url "assets:admin-user-detail" pk=DEFAULT_PK %}">' + cellData + '</a>';
-                return detail_btn.replace('{{ DEFAULT_PK }}', rowData.id);
-            }},
-            {targets: 5, createdCell: function (td, cellData, rowData) {
-                var update_btn = '<a href="{% url "assets:admin-user-update" pk=DEFAULT_PK %}" class="btn btn-xs m-l-xs btn-info">{% trans "Update" %}</a>'.replace('{{ DEFAULT_PK }}', cellData);
-                var del_btn = '<a class="btn btn-xs btn-danger m-l-xs btn_admin_user_delete" data-uid="{{ DEFAULT_PK }}">{% trans "Delete" %}</a>'.replace('{{ DEFAULT_PK }}', cellData);
-                $(td).html(update_btn + del_btn)
-             }}],
-        ajax_url: '{% url "api-assets:admin-user-list" %}',
-        columns: [
-            {data: function(){return ""}}, {data: "name"}, {data: "username" }, {data: "assets_amount", orderable: false},
-            {#{data: "connectivity_amount"}, {data: "connectivity_amount"}, {data: "connectivity_amount"},#}
-            {data: "comment"}, {data: "id", orderable: false, width: "120px"}
-        ]
-    };
-    return jumpserver.initServerSideDataTable(options);
-}
-
-$(document).ready(function(){
-    admin_user_table = initTable();
-    initCsvImportExport(admin_user_table, "{% trans "Admin user" %}")
-})
-.on('click', '.btn_admin_user_delete', function () {
-	var $this = $(this);
-	var $data_table = $("#admin_user_list_table").DataTable();
-	var name = $(this).closest("tr").find(":nth-child(2)").children('a').html();
-	var uid = $this.data('uid');
-	var the_url = '{% url "api-assets:admin-user-detail" pk=DEFAULT_PK %}'.replace('{{ DEFAULT_PK }}', uid);
-	objectDelete($this, name, the_url);
-	setTimeout( function () {
-        $data_table.ajax.reload();
-    }, 3000);
-
-})
-</script>
-{% endblock %}

apps/assets/templates/assets/asset_asset_user_list.html

@@ -1,97 +0,0 @@
-{% extends 'base.html' %}
-{% load common_tags %}
-{% load static %}
-{% load i18n %}
-{% block content %}
-    <div class="wrapper wrapper-content animated fadeInRight">
-        <div class="row">
-            <div class="col-sm-12">
-                <div class="ibox float-e-margins">
-                    <div class="panel-options">
-                        <ul class="nav nav-tabs">
-                            <li>
-                                <a href="{% url 'assets:asset-detail' pk=asset.id %}" class="text-center"><i class="fa fa-laptop"></i> {% trans 'Asset detail' %}</a>
-                            </li>
-                            <li class="active">
-                                <a href="{% url 'assets:asset-user-list' pk=asset.id %}" class="text-center"><i class="fa fa-bar-chart-o"></i> {% trans 'Asset user list' %}</a>
-                            </li>
-                        </ul>
-                    </div>
-                    <div class="tab-content">
-                        <div class="col-sm-8" style="padding-left: 0;">
-                            <div class="ibox float-e-margins">
-                                <div class="ibox-title">
-                                    <span style="float: left">{% trans 'Asset users of' %} <b>{{ asset.hostname }} </b></span>
-                                    <div class="ibox-tools">
-                                        <a class="collapse-link">
-                                            <i class="fa fa-chevron-up"></i>
-                                        </a>
-                                        <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-                                            <i class="fa fa-wrench"></i>
-                                        </a>
-                                        <ul class="dropdown-menu dropdown-user">
-                                        </ul>
-                                        <a class="close-link">
-                                            <i class="fa fa-times"></i>
-                                        </a>
-                                    </div>
-                                </div>
-                                <div class="ibox-content">
-                                    {% include 'assets/_asset_user_list.html' %}
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-sm-4" style="padding-left: 0;padding-right: 0">
-                            <div class="panel panel-primary">
-                                <div class="panel-heading">
-                                    <i class="fa fa-info-circle"></i> {% trans 'Quick modify' %}
-                                </div>
-                                <div class="panel-body">
-                                    <table class="table">
-                                        <tbody>
-                                        {% if asset.is_support_ansible %}
-                                            <tr class="no-borders-tr">
-                                                <td>{% trans 'Test connective' %}:</td>
-                                                <td>
-                                                    <span class="pull-right">
-                                                        <button type="button" class="btn btn-primary btn-xs" id="btn-bulk-test-connective" style="width: 54px">{% trans 'Test' %}</button>
-                                                    </span>
-                                                </td>
-                                            </tr>
-                                        {% endif %}
-                                        </tbody>
-                                    </table>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-{% endblock %}
-{% block custom_foot_js %}
-<script>
-$(document).ready(function () {
-    assetUserListUrl = setUrlParam(defaultAssetUserListUrl, "asset_id", "{{ asset.id }}");
-    initAssetUserTable({assetUserListUrl: assetUserListUrl})
-})
-
-.on('click', '#btn-bulk-test-connective', function () {
-    var assetId = "{{ asset.id }}";
-    var theUrl = "{% url 'api-assets:asset-user-task-create' %}?asset_id={{ DEFAULT_PK }}&latest=1"
-        .replace("{{ DEFAULT_PK }}", assetId);
-    var success = function (data) {
-        var task_id = data.task;
-        showCeleryTaskLog(task_id);
-    };
-    requestApi({
-        url: theUrl,
-        method: 'POST',
-        data: {action: "test"},
-        success: success,
-        flash_message: false
-    });
-})
-</script>
-{% endblock %}

apps/assets/templates/assets/asset_bulk_update.html

@@ -1,71 +0,0 @@
-{% extends '_base_create_update.html' %}
-{% load static %}
-{% load bootstrap3 %}
-{% load i18n %}
-
-{% block form %}
-<div class="ydxbd" id="formlists" style="display: block;">
-    <p id="tags_p" class="mgl-5 c02">{% trans 'Select properties that need to be modified' %}</p>
-    <div class="tagBtnList">
-        <a class="label label-primary" id="change_all" value="1">{% trans 'Select all' %}</a>
-        {% for field in form %}
-            {% if field.name != 'assets' %}
-             <a data-id="{{ field.id_for_label }}" class="label label-default label-primary field-tag" value="1">{{ field.label }}</a>
-            {% endif %}
-        {% endfor %}
-    </div>
-</div>
-<form method="post" class="form-horizontal" id="add_form">
-    {% csrf_token %}
-    {% bootstrap_form form layout="horizontal" %}
-    <div class="form-group abc">
-        <div class="col-sm-4 col-sm-offset-2">
-            <button class="btn btn-white" type="reset">{% trans 'Reset' %}</button>
-            <button class="btn btn-primary" type="submit">{% trans 'Submit' %}</button>
-        </div>
-    </div>
-</form>
-{% include 'assets/_asset_list_modal.html' %}
-{% endblock %}
-
-{% block custom_foot_js %}
-<script>
-    $(document).ready(function () {
-        $('.select2').select2();
-        initAssetTreeModel("#id_assets");
-    }).on('click', '.field-tag', function() {
-        changeField(this);
-    }).on('click', '#change_all', function () {
-        var tag_fields = $('.field-tag');
-        var $this = $(this);
-        var active = '1';
-        if ($this.attr('value') == '0'){
-            active = '0';
-            $this.attr('value', '1').addClass('label-primary')
-        } else {
-            active = '1';
-            $this.attr('value', '0').removeClass('label-primary')
-        }
-        $.each(tag_fields, function (k, v) {
-            changeField(v, active)
-        })
-    });
-
-    function changeField(obj, active) {
-        var $this = $(obj);
-        var field_id = $this.data('id');
-        if (!active) {
-            active = $this.attr('value');
-        }
-        if (active == '0') {
-            $this.attr('value', '1').addClass('label-primary');
-            var form_groups = $('#add_form .form-group:not(.abc)');
-            form_groups.filter(':has(#'  + field_id + ')').show().find('select,input').prop('disabled', false)
-        } else {
-            $this.attr('value', '0').removeClass('label-primary');
-            var form_groups = $('#add_form .form-group:not(.abc)');
-            form_groups.filter(':has(#'  + field_id + ')').hide().find('select,input').prop('disabled', true)
-        }
-    }
-</script>
-{% endblock %}

apps/assets/templates/assets/asset_create.html

@@ -1,249 +0,0 @@
-{% extends '_base_create_update.html' %}
-{% load static %}
-{% load bootstrap3 %}
-{% load i18n %}
-{% load asset_tags %}
-{% load common_tags %}
-
-{% block form %}
-    <form action="" method="post" class="form-horizontal">
-    {% if form.non_field_errors %}
-         <div class="alert alert-danger">
-             {{ form.non_field_errors }}
-         </div>
-    {% endif %}
-    {% csrf_token %}
-    <h3>{% trans 'Basic' %}</h3>
-    {% bootstrap_field form.hostname layout="horizontal" %}
-    {% bootstrap_field form.ip layout="horizontal" %}
-    {% bootstrap_field form.platform layout="horizontal" %}
-    {% bootstrap_field form.public_ip layout="horizontal" %}
-    {% bootstrap_field form.domain layout="horizontal" %}
-    <div class="hr-line-dashed"></div>
-
-    <h3>{% trans 'Protocols' %}</h3>
-    <div class="protocols">
-        {% for fm in formset.forms %}
-        <div class="form-group">
-            <div class="col-md-2 col-md-offset-2" style="text-align: right">{{ fm.name }}</div>
-            <div class="col-md-6">{{ fm.port }}</div>
-            <div class="col-md-1" style="padding: 6px 0">
-                <a class="btn btn-danger btn-xs btn-protocol btn-delete"><span class="fa fa-minus"></span> </a>
-                <a class="btn btn-primary btn-xs btn-protocol btn-add" style="display: none"><span class="fa fa-plus"></span></a>
-            </div>
-        </div>
-        {% endfor %}
-    </div>
-    <div class="hr-line-dashed"></div>
-    <h3>{% trans 'Auth' %}</h3>
-    {% bootstrap_field form.admin_user layout="horizontal" %}
-
-    <div class="hr-line-dashed"></div>
-    <h3>{% trans 'Node' %}</h3>
-    {% bootstrap_field form.nodes layout="horizontal" %}
-
-    <div class="hr-line-dashed"></div>
-    <h3>{% trans 'Labels' %}</h3>
-    <div class="form-group {% if form.errors.labels %} has-error {% endif %}">
-        <label for="{{ form.labels.id_for_label }}" class="col-md-2 control-label">{% trans 'Label' %}</label>
-        <div class="col-md-9">
-            <select name="labels" class="select2 labels" data-placeholder="{% trans 'Label' %}" style="width: 100%" multiple="" tabindex="4" id="{{ form.labels.id_for_label }}">
-                {% for name, labels in form.labels.field.queryset|group_labels %}
-                <optgroup label="{{ name }}">
-                    {% for label in labels %}
-                        {% if label in form.labels.initial %}
-                            <option value="{{ label.id }}" selected>{{ label.value }}</option>
-                        {% else %}
-                            <option value="{{ label.id }}">{{ label.value }}</option>
-                        {% endif %}
-                    {% endfor %}
-                </optgroup>
-                {% endfor %}
-            </select>
-            {% if form.errors.labels %}
-                {% for e in form.errors.labels %}
-                    <div class="help-block">{{ e }}</div>
-                {% endfor %}
-            {% endif %}
-        </div>
-    </div>
-    {% block extra %}
-    {% endblock %}
-
-    <div class="hr-line-dashed"></div>
-    <h3>{% trans 'Other' %}</h3>
-    {% bootstrap_field form.comment layout="horizontal" %}
-    {% bootstrap_field form.is_active layout="horizontal" %}
-
-    <div class="hr-line-dashed"></div>
-    <div class="form-group">
-        <div class="col-sm-4 col-sm-offset-2">
-            <button class="btn btn-default" type="reset"> {% trans 'Reset' %}</button>
-            <button id="submit_button" class="btn btn-primary" type="submit">{% trans 'Submit' %}</button>
-        </div>
-    </div>
-    </form>
-{% endblock %}
-
-{% block custom_foot_js %}
-<script>
-var instanceId = "{{ object.id }}";
-var protocolLen = 0;
-function format(item) {
-   var group = item.element.parentElement.label;
-   return group + ':' + item.text;
-}
-
-function protocolBtnShow() {
-    $(".btn-protocol.btn-add").hide();
-    $(".btn-protocol.btn-add:last").show();
-    var btnDel = $(".btn-protocol.btn-delete");
-    if (btnDel.length === 1) {
-        btnDel.addClass("disabled")
-    } else {
-        btnDel.removeClass("disabled")
-    }
-}
-
-
-$(document).ready(function () {
-    $('.select2').select2({
-        allowClear: true
-    });
-    nodesSelect2Init(".nodes-select2");
-    $(".labels").select2({
-        allowClear: true,
-        templateSelection: format
-    });
-    $('#id_nodes.select2').select2({
-        closeOnSelect: false
-    });
-    protocolBtnShow()
-})
-.on("change", "#id_platform", function () {
-    if (instanceId !== "") {
-        return
-    }
-    var platform = $(this).val();
-    var protocolRef = $(".protocols").find("select").first()
-    var protocol = protocolRef.val();
-
-    var protocolShould = "";
-    if (platform.startsWith("Windows")){
-        protocolShould = "rdp"
-    } else {
-        protocolShould = "ssh"
-    }
-    if (protocol !== protocolShould) {
-        protocolRef.val(protocolShould);
-        protocolRef.trigger("change")
-    }
-})
-.on("click", ".btn-protocol.btn-delete", function () {
-    $(this).parent().parent().remove();
-    protocolBtnShow()
-})
-.on("click", ".btn-protocol.btn-add", function () {
-    var protocol = "";
-    var protocolsRef = $(".protocols");
-    var firstProtocolForm = protocolsRef.children().first();
-    var newProtocolForm = firstProtocolForm.clone();
-    var protocolChoices = $.map($(firstProtocolForm.find('select option')), function (option) {
-        return option.value
-    });
-    var protocolsSet = $.map(protocolsRef.find('select option:selected'), function(option) {
-        return option.value
-    });
-    for (var i=0;i<protocolChoices.length;i++) {
-        var p = protocolChoices[i];
-        if (protocolsSet.indexOf(p) === -1) {
-            protocol = p;
-            break
-        }
-    }
-    if (protocol === "") {
-        return
-    }
-    var formNameNum = [0];
-    protocolsRef.children().find("select").each(function (i, v) {
-        var fieldName = $(v).attr("name");
-        var num = fieldName.split('-')[1];
-        formNameNum.push(parseInt(num));
-    });
-
-    var protocolLenLast = Math.max(...formNameNum);
-    protocolLen = protocolLenLast + 1;
-    var selectName = "form-" + protocolLen + "-name";
-    var selectId = "id_" + selectName;
-    var portName = "form-" + protocolLen + "-port";
-    var portId = "id_" + portName;
-    newProtocolForm.find("select").prop("name", selectName).prop("id", selectId);
-    newProtocolForm.find("input").prop("name", portName).prop("id", portId);
-    newProtocolForm.find("option[value='" + protocol + "']").attr("selected", true);
-    protocolsRef.append(newProtocolForm);
-    protocolLen += 1;
-    $("#" + selectId).trigger("change");
-    protocolBtnShow()
-})
-.on("change", ".protocol-name", function () {
-    var name = $(this).val();
-    var port = 22;
-    switch (name) {
-        case "ssh":
-            port = 22;
-            break;
-        case "rdp":
-            port = 3389;
-            break;
-        case "telnet":
-            port = 23;
-            break;
-        case "vnc":
-            port = 5901;
-            break;
-        default:
-            port = 22;
-            break
-    }
-    $(this).parent().parent().find(".protocol-port").val(port);
-})
-.on("submit", "form", function (evt) {
-    evt.preventDefault();
-    {% block formUrl %}
-    var the_url = '{% url 'api-assets:asset-list' %}';
-    var redirect_to = '{% url "assets:asset-list" %}';
-    var method = "POST";
-    {% endblock %}
-    var form = $("form");
-    var protocols = {};
-    var data = form.serializeObject();
-    objectAttrsIsBool(data, ['is_active']);
-    objectAttrsIsList(data, ['nodes', 'labels']);
-    $.each(data, function (k, v) {
-        if (k.startsWith("form")){
-            delete data[k];
-            var _k = k.split("-");
-            var formName = _k.slice(0, 2).join("-");
-            var key = _k[_k.length-1];
-            if (!protocols[formName]) {
-                protocols[formName] = {}
-            }
-            protocols[formName][key] = v
-        }
-    });
-
-    protocols = $.map(protocols, function (v) {
-        return v.name + '/' + v.port
-    });
-    data["protocols"] = protocols;
-    var props = {
-        url: the_url,
-        data: data,
-        method: method,
-        form: form,
-        redirect_to: redirect_to
-    };
-    formSubmit(props);
- })
-</script>
-{% endblock %}

apps/assets/templates/assets/asset_detail.html

@@ -1,362 +0,0 @@
-{% extends 'base.html' %}
-{% load static %}
-{% load i18n %}
-
-{% block custom_head_css_js %}
-    <link href='{% static "css/plugins/sweetalert/sweetalert.css" %}' rel="stylesheet">
-    <script src='{% static "js/plugins/sweetalert/sweetalert.min.js" %}'></script>
-{% endblock %}
-
-{% block content %}
-    <div class="wrapper wrapper-content animated fadeInRight">
-        <div class="row">
-            <div class="col-sm-12">
-                <div class="ibox float-e-margins">
-                    <div class="panel-options">
-                        <ul class="nav nav-tabs">
-                            <li class="active">
-                                <a href="{% url 'assets:asset-detail' pk=asset.id %}" class="text-center"><i class="fa fa-laptop"></i> {% trans 'Asset detail' %} </a>
-                            </li>
-                            <li>
-                                <a href="{% url 'assets:asset-user-list' pk=asset.id %}" class="text-center"><i class="fa fa-bar-chart-o"></i> {% trans 'Asset user list' %} </a>
-                            </li>
-                            <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>{% trans 'Update' %}</a>
-                            </li>
-                            <li class="pull-right">
-                                <a class="btn btn-outline btn-danger btn-delete-asset">
-                                    <i class="fa fa-trash-o"></i>{% trans 'Delete' %}
-                                </a>
-                            </li>
-                        </ul>
-                    </div>
-                    <div class="tab-content">
-                        <div class="col-sm-8" style="padding-left: 0">
-                            <div class="ibox float-e-margins">
-                                <div class="ibox-title">
-                                    <span class="label"><b>{{ asset.hostname }}</b></span>
-                                    <div class="ibox-tools">
-                                        <a class="collapse-link">
-                                            <i class="fa fa-chevron-up"></i>
-                                        </a>
-                                        <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-                                            <i class="fa fa-wrench"></i>
-                                        </a>
-                                        <ul class="dropdown-menu dropdown-user">
-                                        </ul>
-                                        <a class="close-link">
-                                            <i class="fa fa-times"></i>
-                                        </a>
-                                    </div>
-                                </div>
-                                <div class="ibox-content">
-                                    <table class="table">
-                                        <tbody>
-                                        <tr class="no-borders-tr">
-                                            <td width="20%">{% trans 'Hostname' %}:</td>
-                                            <td><b>{{ asset.hostname }}</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{% trans 'IP' %}:</td>
-                                            <td><b>{{ asset.ip }}</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{% trans 'Public IP' %}:</td>
-                                            <td><b>{{ asset.public_ip|default:"" }}</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{% trans 'Protocol' %}</td>
-                                            <td><b>{{ asset.protocols }}</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{% trans 'Admin user' %}:</td>
-                                            <td><b>{{ asset.admin_user }}</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{% trans 'Domain' %}:</td>
-                                            <td><b>{{ asset.domain|default:"" }}</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{% trans 'Vendor' %}:</td>
-                                            <td><b>{{ asset.vendor|default:"" }}</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{% trans 'Model' %}:</td>
-                                            <td><b>{{ asset.model|default:"" }}</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{% trans 'CPU' %}:</td>
-                                            <td><b>{{ asset.cpu_info }}</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{% trans 'Memory' %}:</td>
-                                            <td><b>{{ asset.memory|default:"" }}</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{% trans 'Disk' %}:</td>
-                                            <td><b>{{ asset.disk_total|default:"" }}</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{% trans 'Platform' %}:</td>
-                                            <td><b>{{ asset.platform|default:"" }}</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{% trans 'OS' %}:</td>
-                                            <td><b>{{ asset.os|default:"" }} {{ asset.os_version|default:"" }} {{ asset.os_arch|default:"" }}</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{% trans 'Is active' %}:</td>
-                                            <td><b>{{ asset.is_active|yesno:"Yes,No" }}</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{% trans 'Serial number' %}:</td>
-                                            <td><b>{{ asset.sn|default:"" }}</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{% trans 'Asset number' %}:</td>
-                                            <td><b>{{ asset.number|default:"" }}</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{% trans 'Created by' %}:</td>
-                                            <td><b>{{ asset.created_by }}</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{% trans 'Date joined' %}:</td>
-                                            <td><b>{{ asset.date_joined|date:"Y-m-j H:i:s" }}</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{% trans 'Comment' %}:</td>
-                                            <td><b>{{ asset.comment }}</b></td>
-                                        </tr>
-                                        </tbody>
-                                    </table>
-                                </div>
-                            </div>
-                        </div>
-                        {% if user.is_superuser or user.is_org_admin %}
-                        <div class="col-sm-4" style="padding-left: 0;padding-right: 0">
-                            <div class="panel panel-primary">
-                                <div class="panel-heading">
-                                    <i class="fa fa-info-circle"></i> {% trans 'Quick modify' %}
-                                </div>
-                                <div class="panel-body">
-                                    <table class="table">
-                                        <tbody>
-                                        <tr class="no-borders-tr">
-                                          <td width="50%">{% trans 'Active' %}:</td>
-                                            <td>
-                                              <span class="pull-right">
-                                                  <div class="switch">
-                                                      <div class="onoffswitch">
-                                                          <input type="checkbox" {% if asset.is_active %} checked {% endif %}  class="onoffswitch-checkbox" id="is_active">
-                                                          <label class="onoffswitch-label" for="is_active">
-                                                              <span class="onoffswitch-inner"></span>
-                                                              <span class="onoffswitch-switch"></span>
-                                                          </label>
-                                                      </div>
-                                                  </div>
-                                              </span>
-                                          </td>
-                                        </tr>
-                                        {% if asset.is_support_ansible %}
-                                        <tr>
-                                            <td>{% trans 'Refresh hardware' %}:</td>
-                                            <td>
-                                                <span class="pull-right">
-                                                    <button type="button" class="btn btn-primary btn-xs" id="btn_refresh_asset" style="width: 54px">{% trans 'Refresh' %}</button>
-                                                </span>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>{% trans 'Test connective' %}:</td>
-                                            <td>
-                                                <span class="pull-right">
-                                                    <button type="button" class="btn btn-primary btn-xs" id="btn-test-is-alive" style="width: 54px">{% trans 'Test' %}</button>
-                                                </span>
-                                            </td>
-                                        </tr>
-                                        {% endif %}
-                                        </tbody>
-                                    </table>
-                                </div>
-                            </div>
-
-                            <div class="panel panel-info">
-                                <div class="panel-heading">
-                                    <i class="fa fa-info-circle"></i> {% trans 'Nodes' %}
-                                </div>
-                                <div class="panel-body">
-                                    <table class="table group_edit" id="add-asset2group">
-                                        <tbody>
-                                        <form>
-                                            <tr>
-                                                <td colspan="2" class="no-borders">
-                                                    <select data-placeholder="{% trans 'Nodes' %}" id="groups_selected" class="nodes-select2 groups" style="width: 100%" multiple="" tabindex="4">
-                                                    </select>
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                                <td colspan="2" class="no-borders">
-                                                    <button type="button" class="btn btn-info btn-sm" id="btn-update-nodes">{% trans 'Confirm' %}</button>
-                                                </td>
-                                            </tr>
-                                        </form>
-
-                                        {% for node in asset.nodes.all %}
-                                        <tr>
-                                          <td ><b class="bdg_node" data-gid={{ node.id }}>{{ node.full_value }}</b></td>
-                                          <td>
-                                              <button class="btn btn-danger pull-right btn-xs btn-leave-node" type="button"><i class="fa fa-minus"></i></button>
-                                          </td>
-                                        </tr>
-                                        {% endfor %}
-                                        </tbody>
-                                    </table>
-                                </div>
-                            </div>
-
-                            <div class="panel panel-warning">
-                                <div class="panel-heading">
-                                    <i class="fa fa-info-circle"></i> {% trans 'Labels' %}
-                                </div>
-                                <div class="panel-body">
-                                    <ul class="tag-list" style="padding: 0">
-                                        {% for label in asset.labels.all %}
-                                            <li ><a href=""><i class="fa fa-tag"></i> {{ label.name }}:{{ label.value }}</a></li>
-                                        {% endfor %}
-                                    </ul>
-                                </div>
-                            </div>
-                        {% endif %}
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-{% endblock %}
-{% block custom_foot_js %}
-<script>
-jumpserver.nodes_selected = {};
-function updateAssetNodes(nodes) {
-    var the_url = "{% url 'api-assets:asset-detail' pk=asset.id %}";
-    var body = {
-        nodes: Object.assign([], nodes)
-    };
-    var success = function(data) {
-        // remove all the selected groups from select > option and rendered ul element;
-        $('.select2-selection__rendered').empty();
-        $('#groups_selected').val('');
-        $.map(jumpserver.nodes_selected, function(group_name, index) {
-            $('#opt_' + index).remove();
-            // change tr html of user groups.
-            $('#add-asset2group tbody').append(
-                '<tr>' +
-                '<td><b class="bdg_node" data-gid="' + index + '">' + group_name + '</b></td>' +
-                '<td><button class="btn btn-danger btn-xs pull-right btn-leave-node" type="button"><i class="fa fa-minus"></i></button></td>' +
-                '</tr>'
-            )
-        });
-        // clear jumpserver.groups_selected
-        jumpserver.nodes_selected = {};
-    };
-    requestApi({
-        url: the_url,
-        body: JSON.stringify(body),
-        success: success
-    });
-}
-
-function refreshAssetHardware() {
-    var the_url = "{% url 'api-assets:asset-task-create' pk=asset.id %}";
-    var success = function(data) {
-        var task_id = data.task;
-        showCeleryTaskLog(task_id);
-    };
-    requestApi({
-        url: the_url,
-        success: success,
-        data: {action: "refresh"},
-        method: 'POST'
-    });
-}
-
-
-$(document).ready(function () {
-    nodesSelect2Init(".nodes-select2")
-    .on('select2:select', function(evt) {
-        var data = evt.params.data;
-        jumpserver.nodes_selected[data.id] = data.text;
-    }).on('select2:unselect', function(evt) {
-        var data = evt.params.data;
-        delete jumpserver.nodes_selected[data.id]
-    });
-}).on('click', '#is_active', function () {
-    var the_url = '{% url "api-assets:asset-detail" pk=asset.id %}';
-    var checked = $(this).prop('checked');
-    var body = {
-        'is_active': checked
-    };
-    var success = '{% trans "Update successfully!" %}';
-    var status = $(".ibox-content > table > tbody > tr:nth-child(13) > td:last >b").text();
-    requestApi({
-        url: the_url,
-        body: JSON.stringify(body),
-        success_message: success
-    });
-    if (status === "False") {
-        $(".ibox-content > table > tbody > tr:nth-child(13) > td:last >b").html('True');
-    }else{
-        $(".ibox-content > table > tbody > tr:nth-child(13) > td:last >b").html('False');
-    }
-}).on('click', '#btn-update-nodes', function () {
-    if (Object.keys(jumpserver.nodes_selected).length === 0) {
-       return false;
-    }
-    var nodes = $('.bdg_node').map(function() {
-        return $(this).data('gid');
-    }).get();
-    $.map(jumpserver.nodes_selected, function(value, index) {
-        nodes.push(index);
-        $('#opt_' + index).remove();
-    });
-    updateAssetNodes(nodes)
-}).on('click', '.btn-leave-node', function() {
-    var $this = $(this);
-    var $tr = $this.closest('tr');
-    var $badge = $tr.find('.bdg_node');
-    var gid = $badge.data('gid');
-    var group_name = $badge.html() || $badge.text();
-    $('#groups_selected').append(
-        '<option value="' + gid + '" id="opt_' + gid + '">' + group_name + '</option>'
-    );
-    $tr.remove();
-    var groups = $('.bdg_node').map(function () {
-        return $(this).data('gid');
-    }).get();
-    updateAssetNodes(groups)
-}).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=DEFAULT_PK %}'.replace('{{ DEFAULT_PK }}', uid);
-    var redirect_url = "{% url 'assets:asset-list' %}";
-    objectDelete($this, name, the_url, redirect_url);
-}).on('click', '#btn_refresh_asset', function () {
-    refreshAssetHardware()
-}).on('click', '#btn-test-is-alive', function () {
-    var the_url = "{% url 'api-assets:asset-task-create' pk=asset.id %}";
-    var success = function(data) {
-        var task_id = data.task;
-        showCeleryTaskLog(task_id);
-    };
-    requestApi({
-        url: the_url,
-        method: 'POST',
-        data: {action: "test"},
-        success: success
-    });
-})
-
-</script>
-{% endblock %}

apps/assets/templates/assets/asset_list.html

@@ -1,416 +0,0 @@
-{% extends '_base_asset_tree_list.html' %}
-{% load static %}
-{% load i18n %}
-
-{% block help_message %}
-    {% trans 'The left side is the asset tree, right click to create, delete, and change the tree node, authorization asset is also organized as a node, and the right side is the asset under that node' %}
-{% endblock %}
-
-{% block table_container %}
-   <div class="uc pull-left m-r-5"><a class="btn btn-sm btn-primary btn-create-asset"> {% trans "Create asset" %} </a></div>
-   {% include '_csv_import_export.html' %}
-   <div class="btn-group" style="float: right">
-      <button data-toggle="dropdown" class="btn btn-default btn-sm dropdown-toggle">{% trans 'Label' %} <span class="caret"></span></button>
-      <ul class="dropdown-menu labels">
-          {% for label in labels %}
-              <li><a style="font-weight: bolder">{{ label.name }}#{{ label.value }}</a></li>
-          {% endfor %}
-      </ul>
-   </div>
-   <table class="table table-striped table-bordered table-hover " id="asset_list_table" style="width: 100%">
-       <thead>
-           <tr>
-               <th class="text-center"><input type="checkbox" class="ipt_check_all"></th>
-               <th class="text-center">{% trans 'Hostname' %}</th>
-               <th class="text-center">{% trans 'IP' %}</th>
-               <th class="text-center">{% trans 'Hardware' %}</th>
-               <th class="text-center">{% trans 'Reachable' %}</th>
-               <th class="text-center">{% trans 'Action' %}</th>
-           </tr>
-       </thead>
-       <tbody>
-       </tbody>
-   </table>
-   <div id="actions" class="hide">
-       <div class="input-group">
-           <select class="form-control m-b" style="width: auto" id="slct_bulk_update">
-               <option value="delete">{% trans 'Delete selected' %}</option>
-               <option value="update">{% trans 'Update selected' %}</option>
-               <option value="remove">{% trans 'Remove from this node' %}</option>
-               <option value="deactive">{% trans 'Deactive selected' %}</option>
-               <option value="active">{% trans 'Active selected' %}</option>
-           </select>
-           <div class="input-group-btn pull-left" style="padding-left: 5px;">
-               <button id='btn_bulk_update' style="height: 32px;"  class="btn btn-sm btn-primary">
-                {% trans 'Submit' %}
-               </button>
-           </div>
-       </div>
-   </div>
-{% include 'assets/_asset_list_modal.html' %}
-{% include 'assets/_node_detail_modal.html' %}
-{% endblock %}
-
-{% block custom_foot_js %}
-<script>
-var asset_table, show = 0;
-var update_node_action = "";
-var current_node_id = null;
-var testDatetime = "{% trans 'Test datetime: ' %}";
-
-function initTable() {
-    var options = {
-        ele: $('#asset_list_table'),
-        columnDefs: [
-            {targets: 1, createdCell: function (td, cellData, rowData) {
-                cellData = htmlEscape(cellData);
-                {% url 'assets:asset-detail' pk=DEFAULT_PK as the_url  %}
-                var detail_btn = '<a href="{{ the_url }}">' + cellData + '</a>';
-                $(td).html(detail_btn.replace('{{ DEFAULT_PK }}', rowData.id));
-            }},
-            {targets: 3, createdCell: function (td, cellData, rowData) {
-                $(td).html(rowData.hardware_info)
-            }},
-            {targets: 4, createdCell: function (td, cellData, rowData) {
-                  var innerHtml = "";
-                  if (cellData.status === 1) {
-                      innerHtml = '<i class="fa fa-circle text-navy"></i>'
-                  } else if (cellData.status === 0) {
-                      innerHtml = '<i class="fa fa-circle text-danger"></i>'
-                  } else {
-                      innerHtml = '<i class="fa fa-circle text-warning"></i>'
-                  }
-                  var dateManual = toSafeLocalDateStr(cellData.datetime);
-                  var dataContent = testDatetime + dateManual;
-                  innerHtml = "<a data-toggle='popover' data-content='" + dataContent + "'" + 'data-placement="auto bottom"' + ">" + innerHtml + "</a>";
-                  $(td).html(innerHtml);
-            }},
-            {targets: 5, createdCell: function (td, cellData, rowData) {
-                var update_btn = '<a href="{% url "assets:asset-update" pk=DEFAULT_PK %}" class="btn btn-xs btn-info">{% trans "Update" %}</a>'.replace("{{ DEFAULT_PK }}", cellData);
-                var del_btn = '<a class="btn btn-xs btn-danger m-l-xs btn-asset-delete" data-uid="{{ DEFAULT_PK }}">{% trans "Delete" %}</a>'.replace('{{ DEFAULT_PK }}', cellData);
-                $(td).html(update_btn + del_btn)
-            }}
-        ],
-        ajax_url: '{% url "api-assets:asset-list" %}',
-        columns: [
-            {data: "id"}, {data: "hostname"}, {data: "ip"},
-            {data: "cpu_cores", orderable: false},
-            {
-                data: "connectivity",
-                orderable: false,
-                width: '60px'
-            }, {data: "id", orderable: false, width: "120px"}
-        ],
-        op_html: $('#actions').html()
-    };
-    asset_table = jumpserver.initServerSideDataTable(options);
-    return asset_table
-}
-function initTree() {
-    initNodeTree({
-        onSelected: onNodeSelected,
-        showMenu: true,
-        otherMenu: `
-            <li class="divider"></li>
-            <li id="menu_asset_add" class="btn-add-asset" data-toggle="modal" data-target="#asset_list_modal" tabindex="0"><a><i class="fa fa-copy"></i> {% trans 'Add assets to node' %}</a></li>
-            <li id="menu_asset_move" class="btn-move-asset" data-toggle="modal" data-target="#asset_list_modal" tabindex="0"><a><i class="fa fa-cut"></i> {% trans 'Move assets to node' %}</a></li>
-            <li class="divider"></li>
-            <li id="menu_refresh_hardware_info" class="btn-refresh-hardware" tabindex="-1"><a><i class="fa fa-refresh"></i> {% trans 'Refresh node hardware info' %}</a></li>
-            <li id="menu_test_connective" class="btn-test-connective" tabindex="-1"><a><i class="fa fa-chain"></i> {% trans 'Test node connective' %}</a></li>
-            <li class="divider"></li>
-            <li id="show_current_asset" class="btn-show-current-asset" style="display: none;" tabindex="-1"><a><i class="fa fa-hand-o-up"></i> {% trans 'Display only current node assets' %}</a></li>
-            <li id="show_all_asset" class="btn-show-all-asset" style="display: none;" tabindex="-1"><a><i class="fa fa-th"></i> {% trans 'Displays all child node assets' %}</a></li>
-            <li class="divider"></li>
-            <li id="menu_node_detail" class="btn-node-detail" tabindex="-1"><a><i class="fa fa-info-circle"></i> {% trans 'Node detail' %}</a></li>
-        `
-    })
-}
-
-function onNodeSelected(event, treeNode) {
-    current_node = treeNode;
-    current_node_id = treeNode.meta.node.id;
-    zTree.expandNode(current_node, true);
-    var url = asset_table.ajax.url();
-    url = setUrlParam(url, "node_id", current_node_id);
-    url = setUrlParam(url, "show_current_asset", getCookie('show_current_asset'));
-    setCookie('node_selected', treeNode.node_id);
-    asset_table.ajax.url(url);
-    asset_table.ajax.reload();
-}
-
-function onAssetModalConfirmAddAssetToNode(table) {
-    var assets_selected = table.selected;
-    if (!current_node_id) {
-        return
-    }
-
-    var data = {'assets': assets_selected};
-    var success = function () {
-        table.selected = [];
-        table.ajax.reload()
-    };
-
-    var url = '';
-    if (update_node_action === "move") {
-        url = "{% url 'api-assets:node-replace-assets' pk=DEFAULT_PK %}".replace("{{ DEFAULT_PK }}", current_node_id);
-    } else {
-        url = "{% url 'api-assets:node-add-assets' pk=DEFAULT_PK %}".replace("{{ DEFAULT_PK }}", current_node_id);
-    }
-
-    requestApi({
-        'url': url,
-        'method': 'PUT',
-        'body': JSON.stringify(data),
-        'success': success
-    })
-}
-
-$(document).ready(function(){
-    asset_table = initTable();
-    initCsvImportExport(asset_table, "{% trans "Asset" %}");
-    initTree();
-
-    if(getCookie('show_current_asset') === '1'){
-        $('#show_all_asset').css('display', 'inline-block');
-    }
-    else{
-        $('#show_current_asset').css('display', 'inline-block');
-    }
-
-    var modalOption = {
-        onModalConfirm: onAssetModalConfirmAddAssetToNode,
-        onModalTableDone: null
-    };
-    setAssetModalOptions(modalOption);
-})
-.on('click', '.labels li', function () {
-    var val = 'label:' + $(this).text();
-    $("#asset_list_table_filter input").val(val);
-    asset_table.search(val).draw();
- })
-.on('click', '.btn-create-asset', function () {
-    var url = "{% url 'assets:asset-create' %}";
-    if (current_node_id) {
-        url += "?node_id=" + current_node_id;
-    }
-    window.open(url, '_self');
-})
-.on('click', '.btn-asset-delete', function () {
-    var $this = $(this);
-    var $data_table = $("#asset_list_table").DataTable();
-    var name = $(this).closest("tr").find(":nth-child(2)").children('a').html();
-    var uid = $this.data('uid');
-    var the_url = '{% url "api-assets:asset-detail" pk=DEFAULT_PK %}'.replace("{{ DEFAULT_PK }}", uid);
-    objectDelete($this, name, the_url);
-    setTimeout( function () {
-        $data_table.ajax.reload();
-    }, 3000);
-})
-.on('click', '#btn_bulk_update', function () {
-    var action = $('#slct_bulk_update').val();
-    var id_list = asset_table.selected;
-    if (id_list.length === 0) {
-        return false;
-    }
-    var the_url = "{% url 'api-assets:asset-list' %}";
-    var data = {
-        'resources': id_list
-    };
-
-    function reloadTable() {
-        asset_table.ajax.reload();
-    }
-
-    function doDeactive() {
-        var data = [];
-        $.each(id_list, function(index, object_id) {
-            var obj = {"pk": object_id, "is_active": false};
-            data.push(obj);
-        });
-        requestApi({
-            url: the_url,
-            method: 'PATCH',
-            body: JSON.stringify(data),
-            success: reloadTable
-        });
-    }
-    function doActive() {
-        var data = [];
-        $.each(id_list, function(index, object_id) {
-            var obj = {"pk": object_id, "is_active": true};
-            data.push(obj);
-        });
-        requestApi({
-            url: the_url,
-            method: 'PATCH',
-            body: JSON.stringify(data),
-            success: reloadTable
-        });
-    }
-    function doDelete() {
-        swal({
-            title: "{% trans 'Are you sure?' %}",
-            text: "{% trans 'This will delete the selected assets !!!' %}",
-            type: "warning",
-            showCancelButton: true,
-            cancelButtonText: "{% trans 'Cancel' %}",
-            confirmButtonColor: "#DD6B55",
-            confirmButtonText: "{% trans 'Confirm' %}",
-            closeOnConfirm: false
-        },function () {
-            function fail() {
-                var msg = "{% trans 'Asset Deleting failed.' %}";
-                swal("{% trans 'Asset Delete' %}", msg, "error");
-            }
-            function success(data) {
-                url = setUrlParam(the_url, 'spm', data.spm);
-                requestApi({
-                    url: url,
-                    method: 'DELETE',
-                    success: function () {
-                        var msg = "{% trans 'Asset Deleted.' %}";
-                        swal("{% trans 'Asset Delete' %}", msg, "success");
-                        reloadTable();
-                    },
-                    error: fail,
-                    flash_message: false,
-                });
-            }
-            requestApi({
-                url: "{% url 'api-common:resources-cache' %}",
-                method: 'POST',
-                body: JSON.stringify(data),
-                success: success,
-                error: fail,
-                flash_message: false
-             })
-        })
-    }
-
-    function doUpdate() {
-        function fail(data) {
-            toastr.error(JSON.parse(data))
-        }
-        function success(data) {
-            var url = "{% url 'assets:asset-bulk-update' %}";
-            location.href= setUrlParam(url, 'spm', data.spm);
-         }
-        requestApi({
-            url: "{% url 'api-common:resources-cache' %}",
-            method:'POST',
-            body:JSON.stringify(data),
-            flash_message:false,
-            success:success,
-            error:fail
-        })
-     }
-
-    function doRemove() {
-       if (!current_node_id) {
-           toastr.error("{% trans 'Please select node' %}");
-           return
-       }
-
-       var data = {
-           'assets': id_list
-       };
-
-       var url = "{% url 'api-assets:node-remove-assets' pk=DEFAULT_PK %}".replace("{{ DEFAULT_PK }}", current_node_id);
-       requestApi({
-           'url': url,
-           'method': 'PUT',
-           'body': JSON.stringify(data),
-           'success': reloadTable
-       })
-    }
-
-    switch(action) {
-        case 'deactive':
-            doDeactive();
-            break;
-        case 'delete':
-            doDelete();
-            break;
-        case 'update':
-            doUpdate();
-            break;
-        case 'active':
-            doActive();
-            break;
-        case 'remove':
-            doRemove();
-            break;
-        default:
-            break;
-    }
-    $(".ipt_check_all").prop("checked", false)
-})
-.on('hidden.bs.modal', '#asset_list_modal', function () {
-    window.location.reload();
-}).on('click', '#menu_asset_add', function () {
-    update_node_action = "add"
-}).on('click', '#menu_asset_move', function () {
-    update_node_action = "move"
-}).on('click', '.btn-test-connective', function () {
-    var url = "{% url 'api-assets:node-task-create' pk=DEFAULT_PK %}";
-    if (!current_node_id) {
-        return null;
-    }
-    var the_url = url.replace("{{ DEFAULT_PK }}", current_node_id);
-    function success(data) {
-        rMenu.css({"visibility" : "hidden"});
-        var task_id = data.task;
-        showCeleryTaskLog(task_id);
-    }
-    requestApi({
-        url: the_url,
-        method: "POST",
-        data: {action: "test"},
-        success: success,
-        flash_message: false
-    });
-}).on('click', '.btn-refresh-hardware', function () {
-    var url = "{% url 'api-assets:node-task-create' pk=DEFAULT_PK %}";
-    var the_url = url.replace("{{ DEFAULT_PK }}", current_node_id);
-    function success(data) {
-        rMenu.css({"visibility" : "hidden"});
-        var task_id = data.task;
-        showCeleryTaskLog(task_id);
-    }
-    requestApi({
-        url: the_url,
-        method: "POST",
-        data: {action: "refresh"},
-        success: success,
-        flash_message: false
-    });
-
-}).on('click', '#menu_node_detail', function(e) {
-    e.preventDefault();
-    var the_url = "{% url 'api-assets:node-detail' pk=DEFAULT_PK %}";
-    the_url = the_url.replace("{{ DEFAULT_PK }}", current_node_id);
-    function drawingNodeDetailModal(data){
-        $('#id_node_detail_id_view').html(data['id']);
-        $('#id_node_detail_name_view').html(data['name']);
-        $('#id_node_detail_full_name_view').html(data['full_value']);
-        $('#id_node_detail_key_view').html(data['key']);
-        $('#node_detail_modal').modal();
-    }
-    function error(data) {
-        alert(data)
-    }
-    function success(data) {
-        drawingNodeDetailModal(data)
-    }
-    requestApi({
-        url: the_url,
-        error: error,
-        method: 'GET',
-        success: success,
-        flash_message: false
-    });
-})
-
-</script>
-
-{% endblock %}

apps/assets/templates/assets/asset_update.html

@@ -1,15 +0,0 @@
-{% extends 'assets/asset_create.html' %}
-{% load bootstrap3 %}
-{% load i18n %}
-
-{% block extra %}
-    <div class="hr-line-dashed"></div>
-    <h3>{% trans 'Configuration' %}</h3>
-    {% bootstrap_field form.number layout="horizontal" %}
-{% endblock %}
-
-{% block formUrl %}
-    var the_url = '{% url 'api-assets:asset-detail' pk=object.id %}';
-    var redirect_to = '{% url "assets:asset-list" %}';
-    var method = 'PUT';
-{% endblock %}

apps/assets/templates/assets/cmd_filter_create_update.html

@@ -1,46 +0,0 @@
-{% extends '_base_create_update.html' %}
-{% load static %}
-{% load bootstrap3 %}
-{% load i18n %}
-
-{% block form %}
-<form id="groupForm" method="post" class="form-horizontal">
-    {% csrf_token %}
-    {% bootstrap_field form.name layout="horizontal" %}
-    {% bootstrap_field form.comment layout="horizontal" %}
-
-    <div class="hr-line-dashed"></div>
-    <div class="form-group">
-        <div class="col-sm-4 col-sm-offset-2">
-            <button class="btn btn-default" type="reset"> {% trans 'Reset' %}</button>
-            <button id="submit_button" class="btn btn-primary" type="submit">{% trans 'Submit' %}</button>
-        </div>
-    </div>
-</form>
-{% endblock %}
-{% block custom_foot_js %}
-<script>
-$(document).ready(function () {
-})
-.on("submit", "form", function (evt) {
-    evt.preventDefault();
-    var the_url = '{% url 'api-assets:cmd-filter-list' %}';
-    var redirect_to = '{% url "assets:cmd-filter-list" %}';
-    var method = "POST";
-    {% if type == "update" %}
-        the_url = '{% url 'api-assets:cmd-filter-detail' pk=object.id %}';
-        method = "PUT";
-    {% endif %}
-    var form = $("form");
-    var data = form.serializeObject();
-    var props = {
-        url: the_url,
-        data: data,
-        method: method,
-        form: form,
-        redirect_to: redirect_to
-     };
-    formSubmit(props);
-})
-</script>
-{% endblock %}

apps/assets/templates/assets/cmd_filter_detail.html

@@ -1,173 +0,0 @@
-{% extends 'base.html' %}
-{% load static %}
-{% load i18n %}
-
-{% block content %}
-    <div class="wrapper wrapper-content animated fadeInRight">
-        <div class="row">
-            <div class="col-sm-12">
-                <div class="ibox float-e-margins">
-                    <div class="panel-options">
-                        <ul class="nav nav-tabs">
-                            <li class="active">
-                                <a href="{% url 'assets:cmd-filter-detail' pk=object.id %}" class="text-center">
-                                <i class="fa fa-laptop"></i> {% trans 'Detail' %}
-                                </a>
-                            </li>
-                            <li>
-                                <li>
-                                <a href="{% url 'assets:cmd-filter-rule-list' pk=object.id %}" class="text-center">
-                                    <i class="fa fa-laptop"></i> {% trans 'Rules' %}
-                                </a>
-                            </li>
-                            <li class="pull-right">
-                                <a class="btn btn-outline btn-default" href="{% url 'assets:cmd-filter-update' pk=object.id %}"><i class="fa fa-edit"></i>{% trans 'Update' %}</a>
-                            </li>
-                            <li class="pull-right">
-                                <a class="btn btn-outline btn-danger btn-del btn-delete-cmd-filter">
-                                    <i class="fa fa-trash-o"></i>{% trans 'Delete' %}
-                                </a>
-                            </li>
-                        </ul>
-                    </div>
-                    <div class="tab-content">
-                        <div class="col-sm-8" style="padding-left: 0;">
-                            <div class="ibox float-e-margins">
-                                <div class="ibox-title">
-                                    <span class="label"><b>{{ object.name }}</b></span>
-                                    <div class="ibox-tools">
-                                        <a class="collapse-link">
-                                            <i class="fa fa-chevron-up"></i>
-                                        </a>
-                                        <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-                                            <i class="fa fa-wrench"></i>
-                                        </a>
-                                        <ul class="dropdown-menu dropdown-user">
-                                        </ul>
-                                        <a class="close-link">
-                                            <i class="fa fa-times"></i>
-                                        </a>
-                                    </div>
-                                </div>
-                                <div class="ibox-content">
-                                    <table class="table">
-                                        <tbody>
-                                        <tr class="no-borders-tr">
-                                            <td>{% trans 'Name' %}:</td>
-                                            <td><b>{{ object.name }}</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{% trans 'Comment' %}:</td>
-                                            <td><b>{{ object.comment }}</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{% trans 'Date created' %}:</td>
-                                            <td><b>{{ object.date_created }}</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{% trans 'Date updated' %}:</td>
-                                            <td><b>{{ object.date_updated }}</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{% trans 'Created by' %}:</td>
-                                            <td><b>{{ object.created_by  }}</b></td>
-                                        </tr>
-                                        </tbody>
-                                    </table>
-                                </div>
-                            </div>
-                        </div>
-
-                        <div class="col-sm-4" style="padding-left: 0; padding-right: 0">
-                            <div class="panel panel-primary">
-                                <div class="panel-heading">
-                                    <i class="fa fa-info-circle"></i> {% trans 'System users' %}
-                                </div>
-                                <div class="panel-body">
-                                    <table class="table group_edit" id="table-clusters">
-                                    <tbody>
-                                    <form>
-                                        <tr>
-                                            <td colspan="2" class="no-borders">
-                                                <select data-placeholder="{% trans 'Binding to system user' %}"  id="system_users_selected"  class="select2" style="width: 100%" multiple="" tabindex="4">
-                                                {% for system_user in system_users_remain %}
-                                                    <option value="{{ system_user.id }}" id="opt_{{ system_user.id }}">{{ system_user }}</option>
-                                                {% endfor %}
-                                                </select>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td colspan="2" class="no-borders">
-                                                <button type="button" class="btn btn-primary btn-sm" id="btn-binding-system-users">{% trans 'Confirm' %}</button>
-                                            </td>
-                                        </tr>
-                                    </form>
-                                    {% for system_user in object.system_users.all %}
-                                    <tr>
-                                      <td><b class="bdg-system-users" data-gid={{ system_user.id }}>{{ system_user }}</b></td>
-                                      <td>
-                                          <button class="btn btn-danger pull-right btn-xs btn-unbound-system-user" data-gid={{ system_user.id }} type="button"><i class="fa fa-minus"></i></button>
-                                      </td>
-                                    </tr>
-                                    {% endfor %}
-                                    </tbody>
-                                    </table>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-{% endblock %}
-{% block custom_foot_js %}
-<script>
-function updateCMDFilterSystemUsers(system_users) {
-    var the_url = "{% url 'api-assets:cmd-filter-detail' pk=object.id %}";
-    var body = {
-        system_users: Object.assign([], system_users)
-    };
-    var success = function(data) {
-        location.reload();
-    };
-    requestApi({
-        url: the_url,
-        body: JSON.stringify(body),
-        method: 'PATCH',
-        success: success
-    });
-}
-$(document).ready(function () {
-    $(".select2").select2({
-        closeOnSelect: false
-    });
-}).on('click', '#btn-binding-system-users', function () {
-    var origin_system_users = $.map($(".bdg-system-users"), function (s) {
-        return $(s).data('gid')
-    });
-    var new_selected_system_users_id = $.map($("#system_users_selected").select2('data'), function (s) {
-        return s.id;
-    });
-    var system_users = origin_system_users.concat(new_selected_system_users_id);
-    updateCMDFilterSystemUsers(system_users)
-}).on('click', '.btn-unbound-system-user', function () {
-    var unbound_system_user = $(this).data('gid');
-    var origin_system_users = $.map($(".bdg-system-users"), function (s) {
-        return $(s).data('gid')
-    });
-    var system_users = $.grep(origin_system_users, function (n, i) {
-        return n !== unbound_system_user
-    });
-    updateCMDFilterSystemUsers(system_users)
-})
-.on('click', '.btn-delete-cmd-filter', function () {
-    var $this = $(this);
-    var name = "{{object.name }}";
-    var uid = "{{ object.id }}";
-    var the_url = '{% url "api-assets:cmd-filter-detail" pk=DEFAULT_PK %}'.replace('{{ DEFAULT_PK }}', uid);
-    var redirect_url = "{% url 'assets:cmd-filter-list' %}";
-    objectDelete($this, name, the_url, redirect_url);
-})
-</script>
-{% endblock %}

apps/assets/templates/assets/cmd_filter_list.html

@@ -1,89 +0,0 @@
-{% extends '_base_list.html' %}
-{% load i18n static %}
-{% block table_search %}{% endblock %}
-{% block help_message %}
-    {% trans 'System user bound some command filter, each command filter has some rules,'%}
-    {% trans 'When user login asset with this system user, then run a command,' %}
-    {% trans 'The command will be filter by rules, higher priority rule run first,' %}
-    {% trans 'When a rule matched, if rule action is allow, then allow command execute,' %}
-    {% trans 'else if action is deny, then command with be deny,' %}
-    {% trans 'else match next rule, if none matched, allowed' %}
-{% endblock %}
-{% block table_container %}
-<div class="uc pull-left  m-r-5">
-    <a href="{% url 'assets:cmd-filter-create' %}" class="btn btn-sm btn-primary"> {% trans "Create command filter" %} </a>
-</div>
-<table class="table table-striped table-bordered table-hover " id="cmd_filter_list_table" >
-    <thead>
-    <tr>
-        <th class="text-center">
-            <input type="checkbox" id="check_all" class="ipt_check_all" >
-        </th>
-        <th class="text-center">{% trans 'Name' %}</th>
-        <th class="text-center">{% trans 'Rules' %}</th>
-        <th class="text-center">{% trans 'System users' %}</th>
-        <th class="text-center">{% trans 'Comment' %}</th>
-        <th class="text-center">{% trans 'Action' %}</th>
-    </tr>
-    </thead>
-    <tbody>
-    </tbody>
-</table>
-{% endblock %}
-{% block content_bottom_left %}{% endblock %}
-{% block custom_foot_js %}
-<script>
-function initTable() {
-    var options = {
-        ele: $('#cmd_filter_list_table'),
-        columnDefs: [
-            {targets: 1, createdCell: function (td, cellData, rowData) {
-                cellData = htmlEscape(cellData);
-                var detail_btn = '<a href="{% url 'assets:cmd-filter-detail' pk=DEFAULT_PK %}">' + cellData + '</a>';
-                $(td).html(detail_btn.replace('{{ DEFAULT_PK }}', rowData.id));
-            }},
-            {targets: 2, createdCell: function (td, cellData, rowData) {
-                var filters_list_btn = '<a href="{% url "assets:cmd-filter-rule-list" pk=DEFAULT_PK %}">' + cellData.length + '</a>';
-                filters_list_btn = filters_list_btn.replace("{{ DEFAULT_PK }}", rowData.id);
-                $(td).html(filters_list_btn);
-            }},
-            {targets: 3, createdCell: function (td, cellData, rowData) {
-                var system_users_list_btn = '<a href="{% url "assets:cmd-filter-detail" pk=DEFAULT_PK %}">' + cellData.length + '</a>';
-                system_users_list_btn = system_users_list_btn.replace("{{ DEFAULT_PK }}", rowData.id);
-                $(td).html(system_users_list_btn);
-            }},
-            {targets: 5, createdCell: function (td, cellData, rowData) {
-                var update_btn = '<a href="{% url "assets:cmd-filter-update" pk=DEFAULT_PK %}" class="btn btn-xs btn-info">{% trans "Update" %}</a>'.replace('{{ DEFAULT_PK }}', cellData);
-                var del_btn = '<a class="btn btn-xs btn-danger m-l-xs btn-delete" data-uid="{{ DEFAULT_PK }}">{% trans "Delete" %}</a>'.replace('{{ DEFAULT_PK }}', cellData);
-                $(td).html(update_btn + del_btn)
-             }}
-        ],
-        ajax_url: '{% url "api-assets:cmd-filter-list" %}',
-        columns: [
-            {data: "id"}, {data: "name" }, {data: "rules", orderable: false},
-            {data: "system_users", orderable: false}, {data: "comment"},
-            {data: "id", orderable: false, width: "120px"}
-        ],
-        op_html: $('#actions').html()
-    };
-    jumpserver.initServerSideDataTable(options);
-}
-$(document).ready(function(){
-    initTable();
-})
-.on('click', '.btn-delete', function () {
-    var $this = $(this);
-    var $data_table = $('#cmd_filter_list_table').DataTable();
-    var name = $(this).closest("tr").find(":nth-child(2)").children('a').html();
-    var uid = $this.data('uid');
-    var the_url = '{% url "api-assets:cmd-filter-detail" pk=DEFAULT_PK %}'.replace('{{ DEFAULT_PK }}', uid);
-    objectDelete($this, name, the_url);
-    setTimeout( function () {
-        $data_table.ajax.reload();
-    }, 3000);
-});
-</script>
-{% endblock %}
-
-
-

apps/assets/templates/assets/cmd_filter_rule_create_update.html

@@ -1,90 +0,0 @@
-{% extends 'base.html' %}
-{% load i18n %}
-{% load static %}
-{% load bootstrap3 %}
-
-{% block content %}
-    <div class="wrapper wrapper-content animated fadeInRight">
-        <div class="row">
-            <div class="col-sm-12">
-                <div class="ibox float-e-margins">
-                    <div class="ibox-title">
-                        <h5>{{ action }}</h5>
-                        <div class="ibox-tools">
-                            <a class="collapse-link">
-                                <i class="fa fa-chevron-up"></i>
-                            </a>
-                            <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-                                <i class="fa fa-wrench"></i>
-                            </a>
-                            <a class="close-link">
-                                <i class="fa fa-times"></i>
-                            </a>
-                        </div>
-                    </div>
-                    <div class="ibox-content">
-                        <form enctype="multipart/form-data" method="post" class="form-horizontal" action="" >
-                            {% csrf_token %}
-                            {% if form.non_field_errors %}
-                                <div class="alert alert-danger">
-                                    {{ form.non_field_errors }}
-                                </div>
-                            {% endif %}
-                            {% bootstrap_form form layout="horizontal" %}
-                            <div class="form-group">
-                                <div class="col-sm-4 col-sm-offset-2">
-                                    <button class="btn btn-white" type="reset">{% trans 'Reset' %}</button>
-                                    <button id="submit_button" class="btn btn-primary" type="submit">{% trans 'Submit' %}</button>
-                                </div>
-                            </div>
-                        </form>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-{% endblock %}
-
-{% block custom_foot_js %}
-<script>
-var content_origin_placeholder = '';
-var content_origin_help_text = '';
-var content_ref = '';
-var content_help_ref = '';
-
-$(document).ready(function(){
-    content_ref = $('#id_content');
-    content_help_ref = content_ref.next();
-    content_origin_placeholder = content_ref.attr('placeholder');
-    content_origin_help_text = content_help_ref.html();
-}).on('change', '#id_type', function () {
-    if ($('#id_type :selected').val() === 'regex') {
-        content_ref.attr('placeholder', 'rm.*|reboot|shutdown');
-        content_help_ref.html("");
-    } else {
-        content_ref.attr('placeholder', content_origin_placeholder);
-        content_help_ref.html(content_origin_help_text);
-    }
-})
-.on("submit", "form", function (evt) {
-    evt.preventDefault();
-    var form = $("form");
-    var data = form.serializeObject();
-    var the_url = '{% url "api-assets:cmd-filter-rule-list" filter_pk=DEFAULT_PK %}'.replace("{{ DEFAULT_PK }}", data.filter);
-    var redirect_to = '{% url "assets:cmd-filter-rule-list" pk=DEFAULT_PK %}'.replace("{{ DEFAULT_PK }}", data.filter);
-    var method = "POST";
-    {% if request_type == "update" %}
-        the_url = '{% url "api-assets:cmd-filter-rule-detail" filter_pk=DEFAULT_PK pk=rule.id %}'.replace('{{ DEFAULT_PK }}', data.filter);
-        method = "PUT";
-    {% endif %}
-    var props = {
-        url: the_url,
-        data: data,
-        method: method,
-        form: form,
-        redirect_to: redirect_to
-     };
-    formSubmit(props);
-})
-</script>
-{% endblock %}

apps/assets/templates/assets/cmd_filter_rule_list.html

@@ -1,110 +0,0 @@
-{% extends 'base.html' %}
-{% load static %}
-{% load i18n %}
-
-{% block content %}
-    <div class="wrapper wrapper-content animated fadeInRight">
-        <div class="row">
-            <div class="col-sm-12">
-                <div class="ibox float-e-margins">
-                    <div class="panel-options">
-                        <ul class="nav nav-tabs">
-                            <li>
-                                <a href="{% url 'assets:cmd-filter-detail' pk=object.id %}" class="text-center">
-                                    <i class="fa fa-laptop"></i> {% trans 'Detail' %}
-                                </a>
-                            </li>
-                            <li class="active">
-                                <a href="{% url 'assets:cmd-filter-rule-list' pk=object.id %}" class="text-center"><i class="fa fa-laptop"></i> {% trans 'Rules' %} </a>
-                            </li>
-                        </ul>
-                    </div>
-                    <div class="tab-content">
-                        <div class="col-sm-12" style="padding-left: 0;">
-                            <div class="" id="content_start">
-                            </div>
-                            <div class="ibox float-e-margins">
-                                <div class="ibox-title">
-                                    <span style="float: left"><b>{% trans 'Command filter rule list' %}</b></span>
-                                    <div class="ibox-tools">
-                                        <a class="collapse-link">
-                                            <i class="fa fa-chevron-up"></i>
-                                        </a>
-                                        <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-                                            <i class="fa fa-wrench"></i>
-                                        </a>
-                                        <ul class="dropdown-menu dropdown-user">
-                                        </ul>
-                                        <a class="close-link">
-                                            <i class="fa fa-times"></i>
-                                        </a>
-                                    </div>
-                                </div>
-                                <div class="ibox-content">
-                                    <div class="uc pull-left  m-r-5">
-                                        <a href="{% url 'assets:cmd-filter-rule-create' filter_pk=object.id %}" class="btn btn-sm btn-primary"> {% trans "Create rule" %} </a>
-                                    </div>
-                                    <table class="table table-striped table-bordered table-hover " id="cmd_filter_rule_list_table" >
-                                        <thead>
-                                        <tr>
-                                            <th class="text-center">
-                                                <input type="checkbox" id="check_all" class="ipt_check_all" >
-                                            </th>
-                                            <th class="text-center">{% trans 'Type' %}</th>
-                                            <th class="text-center">{% trans 'Content' %}</th>
-	                                        <th class="text-center">{% trans 'Priority' %}</th>
-                                            <th class="text-center">{% trans 'Strategy' %}</th>
-                                            <th class="text-center">{% trans 'Comment' %}</th>
-                                            <th class="text-center">{% trans 'Action' %}</th>
-                                        </tr>
-                                        </thead>
-                                        <tbody>
-                                        </tbody>
-                                    </table>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-{% endblock %}
-{% block content_bottom_left %}{% endblock %}
-{% block custom_foot_js %}
-<script>
-function initTable() {
-    var options = {
-        ele: $('#cmd_filter_rule_list_table'),
-        columnDefs: [
-            {targets: 6, createdCell: function (td, cellData, rowData) {
-                var update_btn = '<a href="{% url "assets:cmd-filter-rule-update" filter_pk=object.id pk=DEFAULT_PK %}" class="btn btn-xs btn-info">{% trans "Update" %}</a>'.replace('{{ DEFAULT_PK }}', cellData);
-                var del_btn = '<a class="btn btn-xs btn-danger m-l-xs btn-delete" data-uid="{{ DEFAULT_PK }}">{% trans "Delete" %}</a>'.replace('{{ DEFAULT_PK }}', cellData);
-                $(td).html(update_btn + del_btn)
-            }}
-        ],
-        ajax_url: '{% url "api-assets:cmd-filter-rule-list" filter_pk=object.id %}',
-        columns: [
-            {data: "id"}, {data: "type.display", orderable: false }, {data: 'content'}, {data: 'priority'},
-	        {data: 'action.display', orderable: false}, {data: "comment" }, {data: "id", orderable: false}
-        ],
-        op_html: $('#actions').html()
-    };
-    jumpserver.initServerSideDataTable(options);
-}
-$(document).ready(function(){
-    initTable();
-})
-.on('click', '.btn-delete', function () {
-    var $this = $(this);
-    var $data_table = $('#cmd_filter_rule_list_table').DataTable();
-    var name = $(this).closest("tr").find(":nth-child(2)").html();
-    var uid = $this.data('uid');
-    var the_url = '{% url "api-assets:cmd-filter-rule-detail" filter_pk=object.id pk=DEFAULT_PK %}'.replace('{{ DEFAULT_PK }}', uid);
-    objectDelete($this, name, the_url);
-    setTimeout( function () {
-        $data_table.ajax.reload();
-    }, 3000);
-})
-</script>
-{% endblock %}

apps/assets/templates/assets/delete_confirm.html

@@ -1,15 +0,0 @@
-{% load i18n %}
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>{% trans 'Confirm delete' %}</title>
-</head>
-<body>
-<form action="" method="post">
-    {% csrf_token %}
-    <p>{% trans 'Are you sure delete' %} <b>{{ object.name }} </b> ?</p>
-    <input type="submit" value="Confirm" />
-</form>
-</body>
-</html>

apps/assets/templates/assets/domain_create_update.html

@@ -1,52 +0,0 @@
-{% extends '_base_create_update.html' %}
-{% load static %}
-{% load bootstrap3 %}
-{% load i18n %}
-
-{% block form %}
-<form id="groupForm" method="post" class="form-horizontal">
-    {% csrf_token %}
-    {% bootstrap_field form.name layout="horizontal" %}
-    {% bootstrap_field form.assets layout="horizontal" %}
-    {% bootstrap_field form.comment layout="horizontal" %}
-
-    <div class="hr-line-dashed"></div>
-    <div class="form-group">
-        <div class="col-sm-4 col-sm-offset-2">
-            <button class="btn btn-default" type="reset"> {% trans 'Reset' %}</button>
-            <button id="submit_button" class="btn btn-primary" type="submit">{% trans 'Submit' %}</button>
-        </div>
-    </div>
-</form>
-{% include 'assets/_asset_list_modal.html' %}
-{% endblock %}
-
-{% block custom_foot_js %}
-<script type="text/javascript">
-$(document).ready(function () {
-    $('.select2').select2().off("select2:open");
-    initAssetTreeModel('#id_assets');
-})
-.on("submit", "form", function (evt) {
-    evt.preventDefault();
-    var form = $("form");
-    var data = form.serializeObject();
-    var method = "POST";
-    var the_url = '{% url "api-assets:domain-list" %}';
-    var redirect_to = '{% url "assets:domain-list" %}';
-    {% if type == "update" %}
-        the_url = '{% url 'api-assets:domain-detail' pk=object.id %}';
-        method = "PUT";
-    {% endif %}
-    objectAttrsIsList(data, ['assets']);
-    var props = {
-        url:the_url,
-        data:data,
-        method:method,
-        form:form,
-        redirect_to:redirect_to
-     };
-    formSubmit(props);
- })
-</script>
-{% endblock %}

apps/assets/templates/assets/domain_detail.html

@@ -1,132 +0,0 @@
-{% extends 'base.html' %}
-{% load static %}
-{% load i18n %}
-
-{% block content %}
-    <div class="wrapper wrapper-content animated fadeInRight">
-        <div class="row">
-            <div class="col-sm-12">
-                <div class="ibox float-e-margins">
-                    <div class="panel-options">
-                        <ul class="nav nav-tabs">
-                            <li class="active">
-                                <a href="{% url 'assets:domain-detail' pk=object.id %}" class="text-center"><i class="fa fa-laptop"></i> {% trans 'Detail' %} </a>
-                            </li>
-                            <li>
-                                <a href="{% url 'assets:domain-gateway-list' pk=object.id %}" class="text-center"><i class="fa fa-laptop"></i> {% trans 'Gateway' %} </a>
-                            </li>
-                            <li class="pull-right">
-                                <a class="btn btn-outline btn-default" href="{% url 'assets:domain-update' pk=object.id %}"><i class="fa fa-edit"></i>{% trans 'Update' %}</a>
-                            </li>
-                            <li class="pull-right">
-                                <a class="btn btn-outline btn-danger btn-del btn-delete-domain">
-                                    <i class="fa fa-trash-o"></i>{% trans 'Delete' %}
-                                </a>
-                            </li>
-                        </ul>
-                    </div>
-                    <div class="tab-content">
-                        <div class="col-sm-8" style="padding-left: 0;">
-                            <div class="ibox float-e-margins">
-                                <div class="ibox-title">
-                                    <span class="label"><b>{{ object.name }}</b></span>
-                                    <div class="ibox-tools">
-                                        <a class="collapse-link">
-                                            <i class="fa fa-chevron-up"></i>
-                                        </a>
-                                        <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-                                            <i class="fa fa-wrench"></i>
-                                        </a>
-                                        <ul class="dropdown-menu dropdown-user">
-                                        </ul>
-                                        <a class="close-link">
-                                            <i class="fa fa-times"></i>
-                                        </a>
-                                    </div>
-                                </div>
-                                <div class="ibox-content">
-                                    <table class="table">
-                                        <tbody>
-                                        <tr class="no-borders-tr">
-                                            <td>{% trans 'Name' %}:</td>
-                                            <td><b>{{ object.name }}</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{% trans 'Asset' %}:</td>
-                                            <td><b>{{ object.assets.count }}</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{% trans 'Gateway' %}:</td>
-                                            <td><b>{{ object.gateway_set.count }}</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{% trans 'Date created' %}:</td>
-                                            <td><b>{{ object.date_created }}</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{% trans 'Comment' %}:</td>
-                                            <td><b>{{ object.comment }}</b></td>
-                                        </tr>
-                                        </tbody>
-                                    </table>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-{% endblock %}
-{% block content_bottom_left %}{% endblock %}
-{% block custom_foot_js %}
-<script>
-function initTable() {
-    var options = {
-        ele: $('#domain_list_table'),
-        columnDefs: [
-            {targets: 1, createdCell: function (td, cellData, rowData) {
-                var detail_btn = '<a href="{% url "assets:domain-detail" pk=DEFAULT_PK %}">' + cellData + '</a>';
-                $(td).html(detail_btn.replace('{{ DEFAULT_PK }}', rowData.id));
-             }},
-
-            {targets: 5, createdCell: function (td, cellData, rowData) {
-                var update_btn = '<a href="{% url "assets:domain-update" pk=DEFAULT_PK %}" class="btn btn-xs btn-info">{% trans "Update" %}</a>'.replace('{{ DEFAULT_PK }}', cellData);
-                var del_btn = '<a class="btn btn-xs btn-danger m-l-xs btn-delete" data-uid="{{ DEFAULT_PK }}">{% trans "Delete" %}</a>'.replace('{{ DEFAULT_PK }}', cellData);
-                $(td).html(update_btn + del_btn)
-             }}
-        ],
-        ajax_url: '{% url "api-assets:domain-list" %}',
-        columns: [
-            {data: "id"}, {data: "name" }, {data: "asset_count" },
-            {data: "gateway_count" }, {data: "comment" }, {data: "id"}
-        ],
-        op_html: $('#actions').html()
-    };
-    jumpserver.initDataTable(options);
-}
-$(document).ready(function(){
-    initTable();
-})
-.on('click', '.btn-delete', function () {
-    var $this = $(this);
-    var $data_table = $('#domain_list_table').DataTable();
-    var name = $(this).closest("tr").find(":nth-child(2)").children('a').html();
-    var uid = $this.data('uid');
-    var the_url = '{% url "api-assets:domain-detail" pk=DEFAULT_PK %}'.replace('{{ DEFAULT_PK }}', uid);
-    objectDelete($this, name, the_url);
-    setTimeout( function () {
-        $data_table.ajax.reload();
-    }, 3000);
-})
-.on('click', '.btn-delete-domain', function () {
-    var $this = $(this);
-    var name = "{{ object.name }}";
-    var uid = "{{ object.id }}";
-    var the_url = '{% url "api-assets:domain-detail" pk=DEFAULT_PK %}'.replace('{{ DEFAULT_PK }}', uid);
-    var redirect_url = "{% url 'assets:domain-list' %}";
-    objectDelete($this, name, the_url, redirect_url);
-})
-;
-</script>
-{% endblock %}

apps/assets/templates/assets/domain_gateway_list.html

@@ -1,141 +0,0 @@
-{% extends 'base.html' %}
-{% load static %}
-{% load i18n %}
-
-{% block content %}
-    <div class="wrapper wrapper-content animated fadeInRight">
-        <div class="row">
-            <div class="col-sm-12">
-                <div class="ibox float-e-margins">
-                    <div class="panel-options">
-                        <ul class="nav nav-tabs">
-                            <li>
-                                <a href="{% url 'assets:domain-detail' pk=object.id %}"
-                                   class="text-center"><i
-                                        class="fa fa-laptop"></i> {% trans 'Detail' %}
-                                </a>
-                            </li>
-                            <li class="active">
-                                <a href="{% url 'assets:domain-detail' pk=object.id %}"
-                                   class="text-center"><i
-                                        class="fa fa-laptop"></i> {% trans 'Gateway' %}
-                                </a>
-                            </li>
-                        </ul>
-                    </div>
-                    <div class="tab-content">
-                        <div class="col-sm-12" style="padding-left: 0;">
-                            <div class="" id="content_start">
-                            </div>
-                            <div class="ibox float-e-margins">
-                                <div class="ibox-title">
-                                    <span style="float: left"><b>{% trans 'Gateway list' %}</b></span>
-                                    <div class="ibox-tools">
-                                        <a class="collapse-link">
-                                            <i class="fa fa-chevron-up"></i>
-                                        </a>
-                                        <a class="dropdown-toggle"
-                                           data-toggle="dropdown" href="#">
-                                            <i class="fa fa-wrench"></i>
-                                        </a>
-                                        <ul class="dropdown-menu dropdown-user">
-                                        </ul>
-                                        <a class="close-link">
-                                            <i class="fa fa-times"></i>
-                                        </a>
-                                    </div>
-                                </div>
-                                <div class="ibox-content">
-                                    <div class="uc pull-left  m-r-5">
-                                        <a href="{% url 'assets:domain-gateway-create' pk=object.id %}"
-                                           class="btn btn-sm btn-primary"> {% trans "Create gateway" %} </a>
-                                    </div>
-                                    <table class="table table-striped table-bordered table-hover "
-                                           id="domain_list_table">
-                                        <thead>
-                                        <tr>
-                                            <th class="text-center">
-                                                <input type="checkbox"
-                                                       id="check_all"
-                                                       class="ipt_check_all">
-                                            </th>
-                                            <th class="text-center">{% trans 'Name' %}</th>
-                                            <th class="text-center">{% trans 'IP' %}</th>
-                                            <th class="text-center">{% trans 'Port' %}</th>
-                                            <th class="text-center">{% trans 'Protocol' %}</th>
-                                            <th class="text-center">{% trans 'Username' %}</th>
-                                            <th class="text-center">{% trans 'Comment' %}</th>
-                                            <th class="text-center">{% trans 'Action' %}</th>
-                                        </tr>
-                                        </thead>
-                                        <tbody>
-                                        </tbody>
-                                    </table>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-{% include 'assets/_gateway_test_modal.html' %}
-{% endblock %}
-{% block content_bottom_left %}{% endblock %}
-{% block custom_foot_js %}
-<script>
-function initTable() {
-    var options = {
-        ele: $('#domain_list_table'),
-        columnDefs: [
-            {targets: 7, createdCell: function (td, cellData, rowData) {
-                var update_btn = '<a href="{% url "assets:domain-gateway-update" pk=DEFAULT_PK %}" class="btn btn-xs btn-info">{% trans "Update" %}</a>'.replace('{{ DEFAULT_PK }}', cellData);
-                var del_btn = '<a class="btn btn-xs btn-danger m-l-xs btn-delete" data-uid="{{ DEFAULT_PK }}">{% trans "Delete" %}</a>'.replace('{{ DEFAULT_PK }}', cellData);
-                var test_btn = '<a class="btn btn-xs btn-warning m-l-xs btn-test" data-uid="{{ DEFAULT_PK }}" data-port="PORT">{% trans "Test connection" %}</a>'.replace('{{ DEFAULT_PK }}', cellData).replace("PORT", rowData.port);
-                if(rowData.protocol === 'rdp'){
-                    test_btn = '<a class="btn btn-xs btn-warning m-l-xs btn-test" disabled data-uid="{{ DEFAULT_PK }}">{% trans "Test connection" %}</a>'.replace('{{ DEFAULT_PK }}', cellData);
-                }
-                $(td).html(update_btn + test_btn + del_btn)
-             }}
-        ],
-        ajax_url: '{% url "api-assets:gateway-list" %}?domain={{ object.id }}',
-        columns: [
-            {data: "id"}, {data: "name" }, {data: 'ip'}, {data: 'port'},
-            {data: "protocol", orderable: false}, {data: "username" }, {data: "comment" }, {data: "id", orderable: false}
-        ],
-        op_html: $('#actions').html()
-    };
-    jumpserver.initServerSideDataTable(options);
-}
-$(document).ready(function(){
-    initTable();
-})
-.on('click', '.btn-delete', function () {
-    var $this = $(this);
-    var $data_table = $('#domain_list_table').DataTable();
-    var name = $(this).closest("tr").find(":nth-child(2)").html();
-    var uid = $this.data('uid');
-    var the_url = '{% url "api-assets:gateway-detail" pk=DEFAULT_PK %}'.replace('{{ DEFAULT_PK }}', uid);
-    objectDelete($this, name, the_url);
-    setTimeout( function () {
-        $data_table.ajax.reload();
-    }, 3000);
-}).on('click', '.btn-test', function () {
-    $("#ssh_test_port").val($(this).data('port'));
-    $("#gateway_id").val($(this).data('uid'));
-    $("#gateway_test").modal('show');
-
-}).on('click', '#btn_gateway_test', function () {
-    var data = $("#test_gateway_form").serializeObject();
-    var uid = data.gateway_id;
-    var the_url = '{% url "api-assets:test-gateway-connective" pk=DEFAULT_PK %}'.replace('{{ DEFAULT_PK }}', uid);
-    requestApi({
-        url: the_url,
-        method: "POST",
-        body: JSON.stringify({'port': parseInt(data.port)}),
-        success_message: "{% trans 'Can be connected' %}",
-        {#fail_message: "{% trans 'The connection fails' %}"#}
-     })
-});
-</script>
-{% endblock %}

apps/assets/templates/assets/domain_list.html

@@ -1,79 +0,0 @@
-{% extends '_base_list.html' %}
-{% load i18n static %}
-{% block table_search %}{% endblock %}
-
-{% block help_message %}
-    {% trans 'The domain function is added to address the fact that some environments (such as the hybrid cloud) cannot be connected directly by jumping on the gateway server.' %}
-    <br>
-    {% trans 'JMS => Domain gateway => Target assets' %}
-{% endblock %}
-
-{% block table_container %}
-<div class="uc pull-left  m-r-5">
-    <a href="{% url 'assets:domain-create' %}" class="btn btn-sm btn-primary"> {% trans "Create domain" %} </a>
-</div>
-<table class="table table-striped table-bordered table-hover " id="domain_list_table" >
-    <thead>
-    <tr>
-        <th class="text-center">
-            <input type="checkbox" id="check_all" class="ipt_check_all" >
-        </th>
-        <th class="text-center">{% trans 'Name' %}</th>
-        <th class="text-center">{% trans 'Asset' %}</th>
-        <th class="text-center">{% trans 'Gateway' %}</th>
-        <th class="text-center">{% trans 'Comment' %}</th>
-        <th class="text-center">{% trans 'Action' %}</th>
-    </tr>
-    </thead>
-    <tbody>
-    </tbody>
-</table>
-{% endblock %}
-{% block content_bottom_left %}{% endblock %}
-{% block custom_foot_js %}
-<script>
-function initTable() {
-    var options = {
-        ele: $('#domain_list_table'),
-        columnDefs: [
-            {targets: 1, createdCell: function (td, cellData, rowData) {
-                cellData = htmlEscape(cellData);
-                var detail_btn = '<a href="{% url "assets:domain-detail" pk=DEFAULT_PK %}">' + cellData + '</a>';
-                $(td).html(detail_btn.replace('{{ DEFAULT_PK }}', rowData.id));
-             }},
-            {targets: 3, createdCell: function (td, cellData, rowData) {
-                var gateway_list_btn = '<a href="{% url "assets:domain-gateway-list" pk=DEFAULT_PK %}">' + cellData + '</a>';
-                gateway_list_btn = gateway_list_btn.replace("{{ DEFAULT_PK }}", rowData.id);
-                $(td).html(gateway_list_btn);
-             }},
-            {targets: 5, createdCell: function (td, cellData, rowData) {
-                var update_btn = '<a href="{% url "assets:domain-update" pk=DEFAULT_PK %}" class="btn btn-xs btn-info">{% trans "Update" %}</a>'.replace('{{ DEFAULT_PK }}', cellData);
-                var del_btn = '<a class="btn btn-xs btn-danger m-l-xs btn-delete" data-uid="{{ DEFAULT_PK }}">{% trans "Delete" %}</a>'.replace('{{ DEFAULT_PK }}', cellData);
-                $(td).html(update_btn + del_btn)
-             }}
-        ],
-        ajax_url: '{% url "api-assets:domain-list" %}',
-        columns: [
-            {data: "id"}, {data: "name" }, {data: "asset_count", orderable: false },
-            {data: "gateway_count", orderable: false }, {data: "comment" }, {data: "id", orderable: false, width: "120px"}
-        ],
-        op_html: $('#actions').html()
-    };
-    jumpserver.initServerSideDataTable(options);
-}
-$(document).ready(function(){
-    initTable();
-})
-.on('click', '.btn-delete', function () {
-    var $this = $(this);
-    var $data_table = $('#domain_list_table').DataTable();
-    var name = $(this).closest("tr").find(":nth-child(2)").children('a').html();
-    var uid = $this.data('uid');
-    var the_url = '{% url "api-assets:domain-detail" pk=DEFAULT_PK %}'.replace('{{ DEFAULT_PK }}', uid);
-    objectDelete($this, name, the_url);
-    setTimeout( function () {
-        $data_table.ajax.reload();
-    }, 3000);
-});
-</script>
-{% endblock %}

apps/assets/templates/assets/gateway_create_update.html

@@ -1,124 +0,0 @@
-{% extends 'base.html' %}
-{% load i18n %}
-{% load static %}
-{% load bootstrap3 %}
-
-{% block content %}
-    <div class="wrapper wrapper-content animated fadeInRight">
-        <div class="row">
-            <div class="col-sm-12">
-                <div class="ibox float-e-margins">
-                    <div class="ibox-title">
-                        <h5>{{ action }}</h5>
-                        <div class="ibox-tools">
-                            <a class="collapse-link">
-                                <i class="fa fa-chevron-up"></i>
-                            </a>
-                            <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-                                <i class="fa fa-wrench"></i>
-                            </a>
-                            <a class="close-link">
-                                <i class="fa fa-times"></i>
-                            </a>
-                        </div>
-                    </div>
-                    <div class="ibox-content">
-                        <form enctype="multipart/form-data" method="post" class="form-horizontal" action="" >
-                            {% csrf_token %}
-                            {% if form.non_field_errors %}
-                                <div class="alert alert-danger">
-                                    {{ form.non_field_errors }}
-                                </div>
-                            {% endif %}
-                            <h3>{% trans 'Basic' %}</h3>
-                            {% bootstrap_field form.name layout="horizontal" %}
-                            {% bootstrap_field form.ip layout="horizontal" %}
-                            {% bootstrap_field form.port layout="horizontal" %}
-                            {% bootstrap_field form.protocol layout="horizontal" %}
-                            {% bootstrap_field form.domain layout="horizontal" %}
-
-                            {% block auth %}
-                            <h3 id="auth_title">{% trans 'Auth' %}</h3>
-                            <div class="auth-fields">
-                                {% bootstrap_field form.username layout="horizontal" %}
-                                {% bootstrap_field form.password layout="horizontal" %}
-                                {% bootstrap_field form.private_key layout="horizontal" %}
-                            </div>
-                            {% endblock %}
-
-                            <h3>{% trans 'Other' %}</h3>
-                            {% bootstrap_field form.is_active layout="horizontal" %}
-                            {% bootstrap_field form.comment layout="horizontal" %}
-                            <div class="form-group">
-                                <div class="col-sm-4 col-sm-offset-2">
-                                    <button class="btn btn-white" type="reset">{% trans 'Reset' %}</button>
-                                    <button id="submit_button" class="btn btn-primary" type="submit">{% trans 'Submit' %}</button>
-                                </div>
-                            </div>
-                        </form>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-{% endblock %}
-
-{% block custom_foot_js %}
-<script>
-var protocol_id = '#' + '{{ form.protocol.id_for_label }}';
-var private_key_id = '#' + '{{ form.private_key.id_for_label }}';
-var port = '#' + '{{ form.port.id_for_label }}';
-var username = '#' + '{{ form.username.id_for_label }}';
-var password = '#' + '{{ form.password.id_for_label }}';
-var auth_title = '#auth_title';
-
-function protocolChange() {
-    if ($(protocol_id + " option:selected").text() === 'rdp') {
-        {#$(port).val(3389);#}
-        $(private_key_id).closest('.form-group').addClass('hidden');
-        $(username).closest('.form-group').addClass('hidden');
-        $(password).closest('.form-group').addClass('hidden');
-        $(auth_title).addClass('hidden');
-    } else {
-        {#$(port).val(22);#}
-        $(private_key_id).closest('.form-group').removeClass('hidden');
-        $(username).closest('.form-group').removeClass('hidden');
-        $(password).closest('.form-group').removeClass('hidden');
-        $(auth_title).removeClass('hidden');
-    }
-}
-
-$(document).ready(function(){
-    protocolChange();
-})
-.on("submit", "form", function (evt) {
-    evt.preventDefault();
-    var form = $("form");
-    var data = form.serializeObject();
-    data["private_key"] = $("#id_private_key").data('file');
-    var method = "POST";
-    var the_url = '{% url "api-assets:gateway-list" %}';
-    var redirect_to = '{% url "assets:domain-gateway-list" pk=DEFAULT_PK %}'.replace("{{ DEFAULT_PK }}", data.domain);
-    {% if type == "update" %}
-        the_url = '{% url 'api-assets:gateway-detail' pk=object.id %}';
-        method = "PUT";
-    {% endif %}
-    var props = {
-        url:the_url,
-        data:data,
-        method:method,
-        form:form,
-        redirect_to:redirect_to
-     };
-    formSubmit(props);
-})
-.on('change', '#id_private_key', function () {
-    readFile($(this)).on("onload", function (evt, data) {
-         $(this).data("file", data)
-    })
-})
-.on('change', protocol_id, function(){
-    protocolChange();
-});
-</script>
-{% endblock %}

apps/assets/templates/assets/label_create_update.html

@@ -1,56 +0,0 @@
-{% extends '_base_create_update.html' %}
-{% load static %}
-{% load bootstrap3 %}
-{% load i18n %}
-
-
-
-{% block form %}
-<form id="groupForm" method="post" class="form-horizontal">
-    {% csrf_token %}
-    {% bootstrap_field form.name layout="horizontal" %}
-    {% bootstrap_field form.value layout="horizontal" %}
-    {% bootstrap_field form.assets layout="horizontal" %}
-
-    <div class="hr-line-dashed"></div>
-    <div class="form-group">
-        <div class="col-sm-4 col-sm-offset-2">
-            <button class="btn btn-default" type="reset"> {% trans 'Reset' %}</button>
-            <button id="submit_button" class="btn btn-primary" type="submit">{% trans 'Submit' %}</button>
-        </div>
-    </div>
-</form>
-{% include 'assets/_asset_list_modal.html' %}
-{% endblock %}
-
-{% block custom_foot_js %}
-<script type="text/javascript">
-$(document).ready(function () {
-    $('.select2').select2({
-        closeOnSelect: false
-    })
-    initAssetTreeModel("#id_assets");
-})
-.on("submit", "form", function (evt) {
-    evt.preventDefault();
-    var the_url = '{% url 'api-assets:label-list' %}';
-    var redirect_to = '{% url "assets:label-list" %}';
-    var method = "POST";
-    {% if type == "update" %}
-        the_url = '{% url 'api-assets:label-detail' pk=object.id %}';
-        method = "PUT";
-    {% endif %}
-    var form = $("form");
-    var data = form.serializeObject();
-    objectAttrsIsList(data, ['assets']);
-    var props = {
-        url: the_url,
-        data: data,
-        method: method,
-        form: form,
-        redirect_to: redirect_to
-     };
-    formSubmit(props);
-})
-</script>
-{% endblock %}

apps/assets/templates/assets/label_list.html

@@ -1,72 +0,0 @@
-{% extends '_base_list.html' %}
-{% load i18n static %}
-{% block table_search %}{% endblock %}
-{% block table_container %}
-<div class="uc pull-left  m-r-5">
-    <a href="{% url 'assets:label-create' %}" class="btn btn-sm btn-primary"> {% trans "Create label" %} </a>
-</div>
-<table class="table table-striped table-bordered table-hover " id="label_list_table" >
-    <thead>
-    <tr>
-        <th class="text-center">
-            <input type="checkbox" id="check_all" class="ipt_check_all" >
-        </th>
-        <th class="text-center">{% trans 'Name' %}</th>
-        <th class="text-center">{% trans 'Value' %}</th>
-        <th class="text-center">{% trans 'Asset' %}</th>
-        <th class="text-center">{% trans 'Action' %}</th>
-    </tr>
-    </thead>
-    <tbody>
-    </tbody>
-</table>
-{% endblock %}
-{% block content_bottom_left %}{% endblock %}
-{% block custom_foot_js %}
-<script>
-function initTable() {
-    var options = {
-        ele: $('#label_list_table'),
-        columnDefs: [
-            {targets: 1, createdCell: function (td, cellData, rowData) {
-{#                var detail_btn = '<a href="{% url "assets:label-detail" pk=DEFAULT_PK %}">' + cellData + '</a>';#}
-                cellData = htmlEscape(cellData);
-                var detail_btn = '<a>' + cellData + '</a>';
-                $(td).html(detail_btn.replace('{{ DEFAULT_PK }}', rowData.id));
-             }},
-
-            {targets: 4, createdCell: function (td, cellData, rowData) {
-                var update_btn = '<a href="{% url "assets:label-update" pk=DEFAULT_PK %}" class="btn btn-xs btn-info">{% trans "Update" %}</a>'.replace('{{ DEFAULT_PK }}', cellData);
-                var del_btn = '<a class="btn btn-xs btn-danger m-l-xs btn-delete" data-uid="{{ DEFAULT_PK }}">{% trans "Delete" %}</a>'.replace('{{ DEFAULT_PK }}', cellData);
-                $(td).html(update_btn + del_btn)
-             }}
-        ],
-        ajax_url: '{% url "api-assets:label-list" %}?sort=name',
-        columns: [
-            {data: "id"}, {data: "name" }, {data: "value" },
-            {data: "asset_count", orderable: false},
-            {data: "id", orderable: false, width: "120px"}
-        ],
-        op_html: $('#actions').html()
-    };
-    jumpserver.initServerSideDataTable(options);
-}
-$(document).ready(function(){
-    initTable();
-})
-.on('click', '.btn-delete', function () {
-    var $this = $(this);
-    var $data_table = $('#label_list_table').DataTable();
-    var name = $(this).closest("tr").find(":nth-child(2)").children('a').html();
-    var uid = $this.data('uid');
-    var the_url = '{% url "api-assets:label-detail" pk=DEFAULT_PK %}'.replace('{{ DEFAULT_PK }}', uid);
-    objectDelete($this, name, the_url);
-    setTimeout( function () {
-        $data_table.ajax.reload();
-    }, 3000);
-});
-</script>
-{% endblock %}
-
-
-

apps/assets/templates/assets/platform_create_update.html

@@ -1,79 +0,0 @@
-{% extends '_base_create_update.html' %} {% load static %} {% load bootstrap3 %}
-{% load i18n %}
-
-{% block form %}
-<form id="platformForm" method="post" class="form-horizontal">
-    {% csrf_token %}
-    {% bootstrap_field form.name layout="horizontal" %}
-    {% bootstrap_field form.base layout="horizontal" %}
-    <div class="meta-config">
-        <div hidden class="windows-config">
-        {% bootstrap_field meta_form.security layout="horizontal" %}
-        {% bootstrap_field meta_form.console layout="horizontal" %}
-        </div>
-    </div>
-    {% bootstrap_field form.comment layout="horizontal" %}
-
-    <div class="hr-line-dashed"></div>
-    <div class="form-group">
-        <div class="col-sm-4 col-sm-offset-2">
-            <button class="btn btn-default" type="reset"> {% trans 'Reset' %}</button>
-            <button id="submit_button" class="btn btn-primary" type="submit">{% trans 'Submit' %}</button>
-        </div>
-    </div>
-</form>
-{% endblock %}
-
-{% block custom_foot_js %}
-<script type="text/javascript">
-function toggleWindowConfig() {
-    var baseRef = $("#id_base");
-    var windowConfigRef = $(".windows-config");
-    var windowConfigInputRef = windowConfigRef.find(".form-control");
-    if (baseRef.val().toLowerCase() === 'windows') {
-        windowConfigInputRef.attr('disabled', false);
-        windowConfigRef.show();
-    } else {
-        windowConfigInputRef.attr('disabled', true);
-        windowConfigRef.hide();
-    }
-}
-
-$(document).ready(function () {
-    toggleWindowConfig()
-})
-.on("change", "#id_base", function () {
-    toggleWindowConfig()
-})
-.on("submit", "form", function (evt) {
-    evt.preventDefault();
-    var form = $("form");
-    var data = form.serializeObject();
-    var method = "POST";
-    var theUrl = '{% url "api-assets:platform-list" %}';
-    var redirectTo = '{% url "assets:platform-list" %}';
-    {% if type == "update" %}
-        theUrl = '{% url 'api-assets:platform-detail' pk=object.id %}';
-        method = "PUT";
-    {% endif %}
-
-    var metaData = $(".meta-config .form-control").serializeObject();
-    objectAttrsIsBool(metaData, ['console']);
-    var metaKeys = Object.keys(metaData);
-    metaKeys.forEach(function (k, v) {
-        delete data[k]
-    });
-    data.meta = metaData;
-    console.log(data);
-    var props = {
-        url: theUrl,
-        data: data,
-        method: method,
-        form: form,
-        redirect_to: redirectTo
-     };
-    formSubmit(props);
- })
-</script>
-{% endblock %}
-

apps/assets/templates/assets/platform_detail.html

@@ -1,91 +0,0 @@
-{% extends 'base.html' %}
-{% load static %}
-{% load i18n %}
-
-{% block content %}
-    <div class="wrapper wrapper-content animated fadeInRight">
-        <div class="row">
-            <div class="col-sm-12">
-                <div class="ibox float-e-margins">
-                    <div class="panel-options">
-                        <ul class="nav nav-tabs">
-                            <li class="active">
-                                <a href="{% url 'assets:platform-detail' pk=object.id %}" class="text-center"><i class="fa fa-laptop"></i> {% trans 'Detail' %} </a>
-                            </li>
-                            <li class="pull-right">
-                                <a class="btn btn-outline btn-default" {% if object.internal %} disabled="true" {% endif %} href="{% url 'assets:platform-update' pk=object.id %}"><i class="fa fa-edit"></i>{% trans 'Update' %}</a>
-                            </li>
-                            <li class="pull-right">
-                                <a class="btn btn-outline btn-danger btn-del" {% if object.internal %} disabled="true" {% endif %}>
-                                    <i class="fa fa-trash-o"></i>{% trans 'Delete' %}
-                                </a>
-                            </li>
-                        </ul>
-                    </div>
-                    <div class="tab-content">
-                        <div class="col-sm-8" style="padding-left: 0;">
-                            <div class="ibox float-e-margins">
-                                <div class="ibox-title">
-                                    <span class="label"><b>{{ object.name }}</b></span>
-                                    <div class="ibox-tools">
-                                        <a class="collapse-link">
-                                            <i class="fa fa-chevron-up"></i>
-                                        </a>
-                                        <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-                                            <i class="fa fa-wrench"></i>
-                                        </a>
-                                        <ul class="dropdown-menu dropdown-user">
-                                        </ul>
-                                        <a class="close-link">
-                                            <i class="fa fa-times"></i>
-                                        </a>
-                                    </div>
-                                </div>
-                                <div class="ibox-content">
-                                    <table class="table">
-                                        <tbody>
-                                        <tr class="no-borders-tr">
-                                            <td>{% trans 'Name' %}:</td>
-                                            <td><b>{{ object.name }}</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{% trans 'Base platform' %}:</td>
-                                            <td><b>{{ object.base }}</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{% trans 'Charset' %}:</td>
-                                            <td><b>{{ object.charset }}</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{% trans 'Meta' %}:</td>
-                                            <td><b>{{ object.meta }}</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{% trans 'Comment' %}:</td>
-                                            <td><b>{{ object.comment }}</b></td>
-                                        </tr>
-                                        </tbody>
-                                    </table>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-{% endblock %}
-{% block content_bottom_left %}{% endblock %}
-{% block custom_foot_js %}
-<script>
-$(document).ready(function () {
-}).on('click', '.btn-del', function () {
-    var $this = $(this);
-    var name = "{{ object.name}}";
-    var uid = "{{ object.id }}";
-    var the_url = '{% url "api-assets:platform-detail" pk=DEFAULT_PK %}'.replace('{{ DEFAULT_PK }}', uid);
-    var redirect_url = "{% url 'assets:platform-list' %}";
-    objectDelete($this, name, the_url, redirect_url);
-})
-</script>
-{% endblock %}

apps/assets/templates/assets/platform_list.html

@@ -1,75 +0,0 @@
-{% extends '_base_list.html' %}
-{% load i18n static %}
-{% block table_search %}
-{% endblock %}
-
-{% block table_container %}
-<div class="uc pull-left m-r-5">
-    <a href="{% url "assets:platform-create" %}" class="btn btn-sm btn-primary"> {% trans "Create platform" %} </a>
-</div>
-<table class="table table-striped table-bordered table-hover " id="platform_list_table" >
-    <thead>
-    <tr>
-        <th class="text-center">
-            <input type="checkbox" id="check_all" class="ipt_check_all" >
-        </th>
-        <th class="text-center">{% trans 'Name' %}</th>
-        <th class="text-center">{% trans 'Base platform' %}</th>
-        <th class="text-center">{% trans 'Comment' %}</th>
-        <th class="text-center">{% trans 'Action' %}</th>
-    </tr>
-    </thead>
-    <tbody>
-    </tbody>
-</table>
-{% endblock %}
-{% block content_bottom_left %}{% endblock %}
-{% block custom_foot_js %}
-<script>
-var platformTable = 0;
-function initTable() {
-    var options = {
-        ele: $('#platform_list_table'),
-        columnDefs: [
-            {targets: 1, render: function (cellData, tp, rowData, meta) {
-                cellData = htmlEscape(cellData);
-                var detailBtn = '<a href="{% url "assets:platform-detail" pk=999 %}">' + cellData + '</a>';
-                return detailBtn.replace('999', rowData.id);
-             }},
-            {targets: 4, createdCell: function (td, cellData, rowData) {
-                var updateBtn = '<a href="{% url "assets:platform-update" pk=9999 %}" class="btn btn-xs m-l-xs btn-info" disabled>{% trans "Update" %}</a>'.replace('9999', cellData);
-                var delBtn = '<a class="btn btn-xs btn-danger m-l-xs btn-object-delete" data-uid="{{ DEFAULT_PK }}" disabled>{% trans "Delete" %}</a>'.replace('{{ DEFAULT_PK }}', cellData);
-                if (!rowData.internal) {
-                    updateBtn = updateBtn.replace('disabled', '');
-                    delBtn = delBtn.replace('disabled', '');
-                }
-
-                $(td).html(updateBtn + delBtn)
-             }}
-        ],
-        ajax_url: '{% url "api-assets:platform-list" %}',
-        columns: [
-            {data: "id"}, {data: "name"}, {data: "base" },
-            {data: "comment"}, {data: "id", orderable: false, width: "120px"}
-        ]
-    };
-    platformTable = jumpserver.initServerSideDataTable(options);
-    return platformTable
-}
-
-$(document).ready(function(){
-    initTable();
-})
-.on('click', '.btn-object-delete', function () {
-	var $this = $(this);
-	var name = $(this).closest("tr").find(":nth-child(2)").children('a').html();
-	var uid = $this.data('uid');
-	var theUrl = '{% url "api-assets:platform-detail" pk=0 %}'.replace('0', uid);
-	objectDelete($this, name, theUrl);
-	setTimeout( function () {
-        platformTable.ajax.reload();
-    }, 3000);
-
-})
-</script>
-{% endblock %}

apps/assets/templates/assets/system_user_assets.html

@@ -1,349 +0,0 @@
-{% extends 'base.html' %}
-{% load common_tags %}
-{% load static %}
-{% load i18n %}
-
-{% block custom_head_css_js %}
-    <style>
-    .table.node_edit {
-        margin-bottom: 0;
-    }
-    </style>
-{% endblock %}
-
-{% block content %}
-    <div class="wrapper wrapper-content animated fadeInRight">
-        <div class="row">
-            <div class="col-sm-12">
-                <div class="ibox float-e-margins">
-                    <div class="panel-options">
-                        <ul class="nav nav-tabs">
-                            <li>
-                                <a href="{% url 'assets:system-user-detail' pk=system_user.id %}" class="text-center"><i class="fa fa-laptop"></i> {% trans 'Detail' %} </a>
-                            </li>
-                            <li class="active">
-                                <a href="{% url 'assets:system-user-asset' pk=system_user.id %}" class="text-center">
-                                <i class="fa fa-bar-chart-o"></i> {% trans 'Asset list' %}
-                                </a>
-                            </li>
-                            {% if system_user.username_same_with_user  %}
-                            <li>
-                                <a href="{% url 'assets:system-user-user' pk=system_user.id %}" class="text-center">
-                                <i class="fa fa-bar-chart-o"></i> {% trans 'User list' %}
-                                </a>
-                            </li>
-                            {% endif %}
-                        </ul>
-                    </div>
-                    <div class="tab-content">
-                        <div class="col-sm-8" style="padding-left: 0;">
-                            <div class="ibox float-e-margins">
-                                <div class="ibox-title">
-                                    <span style="float: left"><b>{{ system_user.name }} </b><span class="badge">{{ paginator.count }}</span></span>
-                                    <div class="ibox-tools">
-                                        <a class="collapse-link">
-                                            <i class="fa fa-chevron-up"></i>
-                                        </a>
-                                        <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-                                            <i class="fa fa-wrench"></i>
-                                        </a>
-                                        <ul class="dropdown-menu dropdown-user">
-                                        </ul>
-                                        <a class="close-link">
-                                            <i class="fa fa-times"></i>
-                                        </a>
-                                    </div>
-                                </div>
-                                <div class="ibox-content">
-                                    {% include 'assets/_asset_user_list.html' %}
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-sm-4" style="padding-left: 0;padding-right: 0">
-                            <div class="panel panel-primary">
-                                <div class="panel-heading">
-                                    <i class="fa fa-info-circle"></i> {% trans 'Quick update' %}
-                                </div>
-                                <div class="panel-body">
-                                    <table class="table">
-                                        <tbody>
-                                        <tr class="no-borders-tr">
-                                            <td width="50%">{% trans 'Test assets connective' %}:</td>
-                                            <td>
-                                                <span style="float: right">
-                                                    <button type="button" class="btn btn-primary btn-xs btn-test-connective" style="width: 54px">{% trans 'Test' %}</button>
-                                                </span>
-                                            </td>
-                                        </tr>
-                                        {% if system_user.auto_push %}
-                                        <tr>
-                                            <td width="50%">{% trans 'Push system user now' %}:</td>
-                                            <td>
-                                                <span style="float: right">
-                                                    <button type="button" class="btn btn-primary btn-xs btn-push" style="width: 54px">{% trans 'Push' %}</button>
-                                                </span>
-                                            </td>
-                                        </tr>
-                                        {% endif %}
-                                        </tbody>
-                                    </table>
-                                </div>
-                            </div>
-                            <div class="panel panel-info">
-                                <div class="panel-heading">
-                                    <i class="fa fa-info-circle"></i> {% trans 'Assets' %}
-                                </div>
-                                <div class="panel-body">
-                                    <table class="table" id="add-assets">
-                                        <tbody>
-                                        <form>
-                                            <tr>
-                                                <td colspan="2" class="no-borders">
-                                                    <select data-placeholder="{% trans 'Select assets' %}" id="id_assets" class="assets-select2 select2" style="width: 100%" multiple="" tabindex="4">
-                                                    </select>
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                                <td colspan="2" class="no-borders">
-                                                    <button type="button" class="btn btn-info btn-sm" id="btn-add-to-assets">{% trans 'Confirm' %}</button>
-                                                </td>
-                                            </tr>
-                                        </form>
-                                        </tbody>
-                                    </table>
-                                </div>
-                            </div>
-                            <div class="panel panel-info">
-                                <div class="panel-heading">
-                                    <i class="fa fa-info-circle"></i> {% trans 'Nodes' %}
-                                </div>
-                                <div class="panel-body">
-                                    <table class="table node_edit" id="add-asset2group">
-                                        <tbody>
-                                        <form>
-                                            <tr>
-                                                <td colspan="2" class="no-borders">
-                                                    <select data-placeholder="{% trans 'Select nodes' %}" id="node_selected" class="nodes-select2" style="width: 100%" multiple="" tabindex="4">
-                                                    </select>
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                                <td colspan="2" class="no-borders">
-                                                    <button type="button" class="btn btn-info btn-sm" id="btn-add-to-node">{% trans 'Confirm' %}</button>
-                                                </td>
-                                            </tr>
-                                        </form>
-                                        <table class="table" id="node_list_table">
-                                        </table>
-                                        </tbody>
-                                    </table>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-    {% include 'assets/_asset_list_modal.html' %}
-{% endblock %}
-{% block custom_foot_js %}
-<script>
-var assetsRelationUrl = "{% url 'api-assets:system-users-assets-relation-list' %}";
-var nodesRelationUrl = "{% url 'api-assets:system-users-nodes-relation-list' %}";
-
-function getRelationUrl(type) {
-    var theUrl = "";
-    switch (type) {
-        case "asset":
-            theUrl = assetsRelationUrl;
-            break;
-        case "node":
-            theUrl = nodesRelationUrl;
-            break;
-    }
-    return theUrl;
-}
-
-function addObjects(objectsId, type, success, fail) {
-    if (!objectsId || objectsId.length === 0) {
-        return
-    }
-    var theUrl = getRelationUrl(type);
-    var body = [];
-    objectsId.forEach(function (v) {
-        var data = {systemuser: "{{ object.id }}"};
-        data[type] = v;
-        body.push(data)
-    });
-    if (!success) {
-        success = reloadPage
-    }
-    var option = {
-        url: theUrl,
-        body: JSON.stringify(body),
-        method: "POST",
-        success: success,
-    };
-    if (fail) {
-        option.error = fail;
-    }
-    requestApi(option)
-}
-
-
-function removeObject(objectId, type, success) {
-    if (!objectId)  {
-        return
-    }
-    var theUrl = getRelationUrl(type);
-    theUrl = setUrlParam(theUrl, 'systemuser', "{{ object.id }}");
-    theUrl = setUrlParam(theUrl, type, objectId);
-    if (!success) {
-        success = reloadPage
-    }
-    requestApi({
-        url: theUrl,
-        method: "DELETE",
-        success: success
-    });
-}
-
-function initNodeTable() {
-    var theUrl = setUrlParam(nodesRelationUrl, "systemuser", "{{ object.id }}");
-    var options = {
-        ele: $('#node_list_table'),
-        toggle: true,
-        columnDefs: [
-             {targets: 1, createdCell: function (td, cellData) {
-                  var removeBtn = '<button class="btn btn-danger pull-right btn-xs btn-remove-from-node" data-uid="UID" type="button"><i class="fa fa-minus"></i></button>'
-                      .replace('UID', cellData);
-		  		  $(td).html(removeBtn);
-             }}
-        ],
-        ajax_url: theUrl,
-        dom: "trp",
-        hideDefaultDefs: true,
-        columns: [
-            {data: "node_display", orderable: false},
-            {data: "node", orderable: false},
-        ],
-    };
-    table = jumpserver.initServerSideDataTable(options);
-    return table
-}
-
-
-$(document).ready(function () {
-	$('.select2').select2();
-    nodesSelect2Init(".nodes-select2");
-    initAssetTreeModel('#id_assets');
-	var assetUserListUrl = setUrlParam(defaultAssetUserListUrl, "prefer_id", "{{ system_user.id }}");
-	assetUserListUrl = setUrlParam(assetUserListUrl, "prefer", "system_user");
-    initAssetUserTable({
-        assetUserListUrl: assetUserListUrl,
-        needPush: true
-    });
-    initNodeTable();
-})
-.on('click', '.btn-remove-from-node', function() {
-    var $this = $(this);
-    var nodeId = $(this).data('uid');
-    var success = function() {
-        var $tr = $this.closest('tr');
-        $tr.remove();
-    };
-    removeObject(nodeId, "node", success)
-})
-.on('click', '#btn-add-to-node', function() {
-    var nodes = $("#node_selected").val();
-    addObjects(nodes, "node");
-})
-.on('click', '#btn-add-to-assets', function () {
-    var assets = $("#id_assets").val();
-    var options = $("#id_assets").find(":selected");
-    var failed = function(s, data) {
-        var invalidIndex = [];
-        var validIndex = [];
-        $.each(data, function (k, v) {
-            if (isEmptyObject(v)) {
-                validIndex.push(k)
-            } else {
-                invalidIndex.push(k)
-            }
-        });
-        var invalidLabel = [];
-        $.each(invalidIndex, function (k, v) {
-            invalidLabel.push(options[v].text)
-        });
-        var errorMsg = "{% trans 'Have existed: ' %}";
-        errorMsg += invalidLabel.join(", ");
-        toastr.error(errorMsg)
-    };
-    addObjects(assets, "asset", null, failed);
-})
-.on('click', '.btn-push', function () {
-    var theUrl = "{% url 'api-assets:system-user-task-create' pk=system_user.id %}";
-    var error = function (data) {
-        alert(data)
-    };
-    var success = function (data) {
-        var taskId = data.task;
-        showCeleryTaskLog(taskId);
-    };
-    var data = {
-        action: 'push'
-    };
-    requestApi({
-        url: theUrl,
-        error: error,
-        data: data,
-        method: 'POST',
-        success: success
-    });
-})
-.on('click', '.btn-push-auth', function () {
-    var $this = $(this);
-    var assetId = $this.data('asset');
-    var username = $this.data("username");
-    var theUrl = "{% url 'api-assets:system-user-task-create' pk=object.id %}?username=" + username;
-    var data = {
-        action: 'push',
-        asset: assetId,
-    };
-    var success = function (data) {
-        var taskId = data.task;
-        showCeleryTaskLog(taskId);
-    };
-    var error = function (data) {
-        alert(data)
-    };
-    requestApi({
-        url: theUrl,
-        method: 'POST',
-        data: data,
-        success: success,
-        flash_message: false,
-        error: error
-    })
-})
-.on('click', '.btn-test-connective', function () {
-    var theUrl = "{% url 'api-assets:system-user-task-create' pk=system_user.id %}";
-    var error = function (data) {
-        alert(data)
-    };
-    var success = function (data) {
-        var taskId = data.task;
-        showCeleryTaskLog(taskId);
-    };
-    requestApi({
-        url: theUrl,
-        data: {action: "test"},
-        error: error,
-        method: 'POST',
-        success: success,
-        flash_message: false,
-    });
-})
-</script>
-{% endblock %}

apps/assets/templates/assets/system_user_create.html

@@ -1,7 +0,0 @@
-{% extends 'assets/_system_user.html' %}
-{% load i18n %}
-{% load static %}
-
-{% block auth %}
-    {{ block.super }}
-{% endblock %}

apps/assets/templates/assets/system_user_detail.html

@@ -1,260 +0,0 @@
-{% extends 'base.html' %}
-{% load static %}
-{% load i18n %}
-
-{% block content %}
-    <div class="wrapper wrapper-content animated fadeInRight">
-        <div class="row">
-            <div class="col-sm-12">
-                <div class="ibox float-e-margins">
-                    <div class="panel-options">
-                        <ul class="nav nav-tabs">
-                            <li class="active">
-                                <a href="{% url 'assets:system-user-detail' pk=system_user.id %}" class="text-center"><i class="fa fa-laptop"></i> {% trans 'Detail' %} </a>
-                            </li>
-                            {% if system_user.can_perm_to_asset  %}
-                            <li>
-                                <a href="{% url 'assets:system-user-asset' pk=system_user.id %}" class="text-center">
-                                <i class="fa fa-bar-chart-o"></i> {% trans 'Asset list' %}
-                                </a>
-                            </li>
-                            {% endif %}
-                            {% if system_user.username_same_with_user  %}
-                            <li>
-                                <a href="{% url 'assets:system-user-user' pk=system_user.id %}" class="text-center">
-                                <i class="fa fa-bar-chart-o"></i> {% trans 'User list' %}
-                                </a>
-                            </li>
-                            {% endif %}
-                            <li class="pull-right">
-                                <a class="btn btn-outline btn-default" href="{% url 'assets:system-user-update' pk=system_user.id %}"><i class="fa fa-edit"></i>{% trans 'Update' %}</a>
-                            </li>
-                            <li class="pull-right">
-                                <a class="btn btn-outline btn-danger btn-del">
-                                    <i class="fa fa-trash-o"></i>{% trans 'Delete' %}
-                                </a>
-                            </li>
-                        </ul>
-                    </div>
-                    <div class="tab-content">
-                        <div class="col-sm-8" style="padding-left: 0;">
-                            <div class="ibox float-e-margins">
-                                <div class="ibox-title">
-                                    <span class="label"><b>{{ system_user.name }}</b></span>
-                                    <div class="ibox-tools">
-                                        <a class="collapse-link">
-                                            <i class="fa fa-chevron-up"></i>
-                                        </a>
-                                        <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-                                            <i class="fa fa-wrench"></i>
-                                        </a>
-                                        <ul class="dropdown-menu dropdown-user">
-                                        </ul>
-                                        <a class="close-link">
-                                            <i class="fa fa-times"></i>
-                                        </a>
-                                    </div>
-                                </div>
-                                <div class="ibox-content">
-                                    <table class="table">
-                                        <tbody>
-                                        <tr class="no-borders-tr">
-                                            <td>{% trans 'Name' %}:</td>
-                                            <td><b>{{ system_user.name }}</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{% trans 'Username' %}:</td>
-                                            {% if system_user.username_same_with_user %}
-                                                <td><b>{% trans 'Username same with user' %}</b></td>
-                                            {% else %}
-                                                <td><b>{{ system_user.username }}</b></td>
-                                            {% endif %}
-                                        </tr>
-                                        <tr>
-                                            <td>{% trans 'Login mode' %}:</td>
-                                            <td><b>{{ system_user.get_login_mode_display }}</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{% trans 'Protocol' %}:</td>
-                                            <td><b id="id_protocol_type">{{ system_user.protocol }}</b></td>
-                                        </tr>
-                                        <tr class="only-ssh">
-                                            <td>{% trans 'Sudo' %}:</td>
-                                            <td><b>{{ system_user.sudo }}</b></td>
-                                        </tr>
-                                        {% if system_user.shell %}
-                                        <tr class="only-ssh">
-                                            <td>{% trans 'Shell' %}:</td>
-                                            <td><b>{{ system_user.shell }}</b></td>
-                                        </tr>
-                                        {% endif %}
-                                        {% if system_user.home %}
-                                        <tr>
-                                            <td>{% trans 'Home' %}:</td>
-                                            <td><b>{{ system_user.home }}</b></td>
-                                        </tr>
-                                        {% endif %}
-                                        {% if system_user.uid %}
-                                            <tr>
-                                                <td>{% trans 'Uid' %}:</td>
-                                                <td><b>{{ system_user.uid }}</b></td>
-                                            </tr>
-                                        {% endif %}
-                                        <tr>
-                                            <td>{% trans 'Date created' %}:</td>
-                                            <td><b>{{ system_user.date_created }}</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{% trans 'Created by' %}:</td>
-                                            <td><b>{{ system_user.created_by  }}</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{% trans 'Comment' %}:</td>
-                                            <td><b>{{ system_user.comment }}</b></td>
-                                        </tr>
-                                        </tbody>
-                                    </table>
-                                </div>
-                            </div>
-                        </div>
-
-                        <div class="col-sm-4" style="padding-left: 0;padding-right: 0">
-                            <div class="panel panel-primary ">
-                                <div class="panel-heading">
-                                    <i class="fa fa-info-circle"></i> {% trans 'Quick update' %}
-                                </div>
-                                <div class="panel-body">
-                                    <table class="table">
-                                        <tbody>
-                                        <tr class="only-ssh-rdp">
-                                            <td width="50%">{% trans 'Auto push' %}:</td>
-                                            <td>
-                                                <span class="pull-right">
-                                                    <div class="switch">
-                                                        <div class="onoffswitch">
-                                                            <input type="checkbox" {% if system_user.auto_push %} checked {% endif %} class="onoffswitch-checkbox" id="btn-auto-push">
-                                                            <label class="onoffswitch-label" for="btn-auto-push">
-                                                                <span class="onoffswitch-inner"></span>
-                                                                <span class="onoffswitch-switch"></span>
-                                                            </label>
-                                                        </div>
-                                                    </div>
-                                                </span>
-                                            </td>
-                                        </tr>
-                                        </tbody>
-                                    </table>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    {% if system_user.is_need_cmd_filter %}
-                    <div class="col-sm-4" style="padding-left: 0; padding-right: 0">
-                        <div class="panel panel-info">
-                            <div class="panel-heading">
-                                <i class="fa fa-info-circle"></i> {% trans 'Command filter' %}
-                            </div>
-                            <div class="panel-body">
-                                <table class="table">
-                                <tbody>
-                                <form>
-                                    <tr>
-                                        <td colspan="2" class="no-borders">
-                                            <select data-placeholder="{% trans 'Binding command filters' %}"  id="command_filters_selected"  class="select2" style="width: 100%" multiple="" tabindex="4">
-                                            {% for cf in cmd_filters_remain %}
-                                                <option value="{{ cf.id }}" id="opt_{{ cf.id }}" >{{ cf }}</option>
-                                            {% endfor %}
-                                            </select>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td colspan="2" class="no-borders">
-                                            <button type="button" class="btn btn-info btn-sm" id="btn-binding-command-filters">{% trans 'Confirm' %}</button>
-                                        </td>
-                                    </tr>
-                                </form>
-                                {% for cf in object.cmd_filters.all %}
-                                <tr>
-                                  <td><b class="bdg-command-filters" data-gid={{ cf.id }}>{{ cf }}</b></td>
-                                  <td>
-                                      <button class="btn btn-danger pull-right btn-xs btn-unbound-command-filter" data-gid={{ cf.id }} type="button"><i class="fa fa-minus"></i></button>
-                                  </td>
-                                </tr>
-                                {% endfor %}
-                                </tbody>
-                                </table>
-                            </div>
-                        </div>
-                    </div>
-                    {% endif %}
-                </div>
-            </div>
-        </div>
-    </div>
-{% endblock %}
-{% block custom_foot_js %}
-<script>
-function updateCommandFilters(command_filters) {
-    var the_url = "{% url 'api-assets:system-user-detail' pk=system_user.id %}";
-    var body = {
-        cmd_filters: Object.assign([], command_filters)
-    };
-    var success = function(data) {
-        location.reload();
-    };
-    requestApi({
-        url: the_url,
-        body: JSON.stringify(body),
-        success: success
-    });
-}
-$(document).ready(function () {
-    var protocol = $('#id_protocol_type').text();
-    if(protocol !== 'ssh'){
-        $('.only-ssh').addClass("hidden")
-    }
-    if(["ssh", "rdp"].indexOf(protocol) === -1){
-        $('.only-ssh-rdp').addClass('hidden');
-    }
-    $(".panel-body .table tr:visible:first").addClass('no-borders-tr');
-    $('.select2').select2()
-})
-.on('click', '#btn-auto-push', function () {
-    var checked = $(this).prop('checked');
-    var the_url = "{% url 'api-assets:system-user-detail' pk=system_user.id %}";
-    var body = {
-        'auto_push': checked
-    };
-    requestApi({
-        url: the_url,
-        body: JSON.stringify(body)
-    });
-}).on('click', '.btn-del', function () {
-    var $this = $(this);
-    var name = "{{ system_user.name}}";
-    var uid = "{{ system_user.id }}";
-    var the_url = '{% url "api-assets:system-user-detail" pk=DEFAULT_PK %}'.replace('{{ DEFAULT_PK }}', uid);
-    var redirect_url = "{% url 'assets:system-user-list' %}";
-    objectDelete($this, name, the_url, redirect_url);
-})
-.on('click', '#btn-binding-command-filters', function () {
-    var new_selected_cmd_filters = $.map($('#command_filters_selected').select2('data'), function (i) {
-        return i.id;
-    });
-    var origin_cmd_filters = $.map($(".bdg-command-filters"), function (s) {
-        return $(s).data('gid')
-    });
-    var command_filters = new_selected_cmd_filters.concat(origin_cmd_filters);
-    updateCommandFilters(command_filters)
-}).on('click', '.btn-unbound-command-filter', function () {
-    var unbound_command_filter = $(this).data('gid');
-    var origin_command_filters = $.map($(".bdg-command-filters"), function (s) {
-        return $(s).data('gid')
-    });
-    var command_filters = $.grep(origin_command_filters, function (n, i) {
-        return n !== unbound_command_filter
-    });
-    updateCommandFilters(command_filters)
-})
-</script>
-{% endblock %}

apps/assets/templates/assets/system_user_list.html

@@ -1,90 +0,0 @@
-{% extends '_base_list.html' %}
-{% load i18n %}
-
-{% block help_message %}
-    {% trans 'System user is JumpServer jump login assets used by the users, can be understood as the user login assets, such as web, sa, the dba (` ssh web@some-host `), rather than using a user the username login server jump (` ssh xiaoming@some-host `); '%}
-    {% trans 'In simple terms, users log into JumpServer using their own username, and JumpServer uses system users to log into assets. '%}
-    {% trans 'When system users are created, if you choose auto push JumpServer to use Ansible push system users into the asset, if the asset (Switch) does not support ansible, please manually fill in the account password.' %}
-{% endblock %}
-
-{% block table_search %}
-    {% include '_csv_import_export.html' %}
-{% endblock %}
-
-{% block table_container %}
-<div class="uc pull-left m-r-5">
-    <a href="{% url 'assets:system-user-create' %}" class="btn btn-sm btn-primary "> {% trans "Create system user" %} </a>
-</div>
-<table class="table table-striped table-bordered table-hover " id="system_user_list_table" >
-    <thead>
-    <tr>
-        <th class="text-center">
-            <input type="checkbox" id="check_all" class="ipt_check_all">
-        </th>
-        <th class="text-center">{% trans 'Name' %}</th>
-        <th class="text-center">{% trans 'Username' %}</th>
-        <th class="text-center">{% trans 'Protocol' %}</th>
-        <th class="text-center">{% trans 'Login mode' %}</th>
-        <th class="text-center">{% trans 'Asset' %}</th>
-        <th class="text-center">{% trans 'Comment' %}</th>
-        <th class="text-center">{% trans 'Action' %}</th>
-    </tr>
-    </thead>
-    <tbody>
-    </tbody>
-</table>
-{% endblock %}
-{% block custom_foot_js %}
-<script>
-var system_user_table = 0;
-
-
-function initTable() {
-    var options = {
-        ele: $('#system_user_list_table'),
-        columnDefs: [
-            {targets: 1, createdCell: function (td, cellData, rowData) {
-                cellData = htmlEscape(cellData);
-                var detail_btn = '<a href="{% url "assets:system-user-detail" pk=DEFAULT_PK %}">' + cellData + '</a>';
-                $(td).html(detail_btn.replace('{{ DEFAULT_PK }}', rowData.id));
-            }},
-            {targets: 4, createdCell: function (td, cellData, rowData) {
-                $(td).html(rowData.login_mode_display);
-            }},
-            {targets: 7, createdCell: function (td, cellData, rowData) {
-                var update_btn = '<a href="{% url "assets:system-user-update" pk=DEFAULT_PK %}" class="btn btn-xs m-l-xs btn-info">{% trans "Update" %}</a>'.replace('{{ DEFAULT_PK }}', cellData);
-                var del_btn = '<a class="btn btn-xs btn-danger m-l-xs btn_admin_user_delete" data-uid="{{ DEFAULT_PK }}">{% trans "Delete" %}</a>'.replace('{{ DEFAULT_PK }}', cellData);
-                $(td).html(update_btn + del_btn)
-            }},
-        ],
-        ajax_url: '{% url "api-assets:system-user-list" %}',
-        columns: [
-            {data: "id" }, {data: "name" }, {data: "username" }, {data: "protocol"},
-            {data: "login_mode"}, {data: "assets_amount", width: "60px"},
-            {data: "comment" }, {data: "id", orderable: false, width: "120px"}
-        ],
-        op_html: $('#actions').html()
-    };
-    return jumpserver.initServerSideDataTable(options);
-}
-
-$(document).ready(function(){
-    system_user_table = initTable();
-    initCsvImportExport(system_user_table, "{% trans 'System user' %}")
-})
-.on('click', '.btn_admin_user_delete', function () {
-    var $this = $(this);
-    var $data_table = $('#cluster_list_table').DataTable();
-    var name = $(this).closest("tr").find(":nth-child(2)").children('a').html();
-    var uid = $this.data('uid');
-    var the_url = '{% url "api-assets:system-user-detail" pk=DEFAULT_PK %}'.replace('{{ DEFAULT_PK }}', uid);
-    objectDelete($this, name, the_url);
-    setTimeout( function () {
-        $data_table.ajax.reload();
-    }, 3000);
-})
-</script>
-{% endblock %}
-
-
-

apps/assets/templates/assets/system_user_update.html

@@ -1,22 +0,0 @@
-{% extends 'assets/_system_user.html' %}
-{% load i18n %}
-{% load static %}
-{% load bootstrap3 %}
-
-{% block auth %}
-    {% bootstrap_field form.password layout="horizontal" %}
-    {% bootstrap_field form.private_key layout="horizontal" %}
-    <div class="form-group">
-        <label for="{{ form.as_push.id_for_label }}" class="col-sm-2 control-label">{% trans 'Auto push' %}</label>
-        <div class="col-sm-8">
-            {{ form.auto_push}}
-        </div>
-    </div>
-{% endblock %}
-
-{% block formUrl %}
-    var the_url = '{% url 'api-assets:system-user-detail' pk=object.pk %}';
-    var redirect_to = '{% url "assets:system-user-list" %}';
-    var method = "PUT";
-{% endblock %}
-

apps/assets/templates/assets/system_user_users.html

@@ -1,212 +0,0 @@
-{% extends 'base.html' %}
-{% load static %}
-{% load i18n %}
-
-{% block custom_head_css_js %}
-    <style>
-    .table.node_edit {
-        margin-bottom: 0;
-    }
-    </style>
-{% endblock %}
-
-{% block content %}
-    <div class="wrapper wrapper-content animated fadeInRight">
-        <div class="row">
-            <div class="col-sm-12">
-                <div class="ibox float-e-margins">
-                    <div class="panel-options">
-                        <ul class="nav nav-tabs">
-                            <li>
-                                <a href="{% url 'assets:system-user-detail' pk=system_user.id %}" class="text-center"><i class="fa fa-laptop"></i> {% trans 'Detail' %} </a>
-                            </li>
-                            <li>
-                                <a href="{% url 'assets:system-user-asset' pk=system_user.id %}" class="text-center">
-                                <i class="fa fa-bar-chart-o"></i> {% trans 'Asset list' %}
-                                </a>
-                            </li>
-                            {% if system_user.username_same_with_user  %}
-                            <li class="active">
-                                <a href="{% url 'assets:system-user-user' pk=system_user.id %}" class="text-center">
-                                <i class="fa fa-bar-chart-o"></i> {% trans 'User list' %}
-                                </a>
-                            </li>
-                            {% endif %}
-                        </ul>
-                    </div>
-                    <div class="tab-content">
-                        <div class="col-sm-8" style="padding-left: 0;">
-                            <div class="ibox float-e-margins">
-                                <div class="ibox-title">
-                                    <span style="float: left"><b>{{ system_user.name }} </b><span class="badge">{{ paginator.count }}</span></span>
-                                    <div class="ibox-tools">
-                                        <a class="collapse-link">
-                                            <i class="fa fa-chevron-up"></i>
-                                        </a>
-                                        <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-                                            <i class="fa fa-wrench"></i>
-                                        </a>
-                                        <ul class="dropdown-menu dropdown-user">
-                                        </ul>
-                                        <a class="close-link">
-                                            <i class="fa fa-times"></i>
-                                        </a>
-                                    </div>
-                                </div>
-                                <div class="ibox-content">
-                                    <table class="table table-striped table-bordered table-hover" id="user_list_table" style="width: 100%">
-                                        <thead>
-                                        <tr>
-                                            <th class="text-center">
-                                                <input type="checkbox" id="check_all" class="ipt_check_all">
-                                            </th>
-                                            <th class="text-center">{% trans 'User' %}</th>
-                                            <th class="text-center">{% trans 'Action' %}</th>
-                                        </tr>
-                                        </thead>
-                                        <tbody>
-                                        </tbody>
-                                    </table>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-sm-4" style="padding-left: 0;padding-right: 0">
-                            <div class="panel panel-info">
-                                <div class="panel-heading">
-                                    <i class="fa fa-info-circle"></i> {% trans 'Users' %}
-                                </div>
-                                <div class="panel-body">
-                                    <table class="table" id="add-users">
-                                        <tbody>
-                                        <form>
-                                            <tr>
-                                                <td colspan="2" class="no-borders">
-                                                    <select data-placeholder="{% trans 'Select users' %}" id="id_users" class="users-select2 select2" style="width: 100%" multiple="" tabindex="4">
-                                                    </select>
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                                <td colspan="2" class="no-borders">
-                                                    <button type="button" class="btn btn-info btn-sm" id="btn-add-users">{% trans 'Confirm' %}</button>
-                                                </td>
-                                            </tr>
-                                        </form>
-                                        </tbody>
-                                    </table>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-{% endblock %}
-{% block custom_foot_js %}
-<script>
-var usersRelationUrl = "{% url 'api-assets:system-users-users-relation-list' %}?systemuser={{ system_user.id }}";
-var userTable = null;
-
-function initTable() {
-    var options = {
-        ele: $('#user_list_table'),
-        toggle: true,
-        ajax_url: usersRelationUrl,
-        columnDefs: [
-            {
-                targets: 2, createdCell: function (td, cellData, rowData) {
-                    var removeBtn = '<button class="btn btn-xs btn-danger m-l-xs btn-remove" data-uid=UID>{% trans "Remove" %}</button>';
-                    removeBtn = removeBtn.replace("UID", rowData.user);
-				    $(td).html(removeBtn);
-                },
-                width: '70px'
-            }
-        ],
-        columns: [
-            {data: "id"}, {data: "user_display"},
-            {data: "id", orderable: false}
-        ],
-        op_html: $('#actions').html(),
-    };
-    userTable = jumpserver.initServerSideDataTable(options);
-    return userTable
-}
-
-function addUsers(objectsId, success, fail) {
-    if (!objectsId || objectsId.length === 0) {
-        return
-    }
-    var theUrl = usersRelationUrl;
-    var body = [];
-    objectsId.forEach(function (v) {
-        var data = {systemuser: "{{ object.id }}"};
-        data.user = v;
-        body.push(data)
-    });
-    if (!success) {
-        success = reloadPage
-    }
-    var option = {
-        url: theUrl,
-        body: JSON.stringify(body),
-        method: "POST",
-        success: success,
-    };
-    if (fail) {
-        option.error = fail;
-    }
-    requestApi(option)
-}
-
-function removeUser(userId, success) {
-    if (!userId)  {
-        return
-    }
-    var theUrl = usersRelationUrl;
-    theUrl = setUrlParam(theUrl, 'user', userId);
-    if (!success) {
-        success = function () {
-            userTable.ajax.reload();
-        }
-    }
-    requestApi({
-        url: theUrl,
-        method: "DELETE",
-        success: success,
-        success_message: "{% trans "Remove success" %}"
-    });
-}
-
-$(document).ready(function () {
-	initTable();
-	usersSelect2Init('.users-select2');
-})
-.on('click', '.btn-remove', function() {
-    var userId = $(this).data("uid");
-    removeUser(userId);
-})
-.on('click', '#btn-add-users', function() {
-    var usersId = $('.users-select2').val();
-    var options = $(".users-select2").find(":selected");
-    var failed = function(s, data) {
-        var invalidIndex = [];
-        var validIndex = [];
-        $.each(data, function (k, v) {
-            if (isEmptyObject(v)) {
-                validIndex.push(k)
-            } else {
-                invalidIndex.push(k)
-            }
-        });
-        var invalidLabel = [];
-        $.each(invalidIndex, function (k, v) {
-            invalidLabel.push(options[v].text)
-        });
-        var errorMsg = "{% trans 'Have existed: ' %}";
-        errorMsg += invalidLabel.join(", ");
-        toastr.error(errorMsg)
-    };
-    addUsers(usersId, null, failed);
-})
-</script>
-{% endblock %}

apps/assets/templates/assets/user_asset_list.html

@@ -1,132 +0,0 @@
-{% extends 'base.html' %}
-{% load static %}
-{% load i18n %}
-
-{% block custom_head_css_js %}
-    <link href="{% static 'css/plugins/ztree/awesomeStyle/awesome.css' %}" rel="stylesheet">
-    <script type="text/javascript" src="{% static 'js/plugins/ztree/jquery.ztree.all.min.js' %}"></script>
-    <script src="{% static 'js/jquery.form.min.js' %}"></script>
-{% endblock %}
-
-{% block content %}
-<div class="wrapper wrapper-content">
-   <div class="row">
-       {% include 'users/_granted_assets.html' %}
-   </div>
-</div>
-
-{% include 'assets/_user_asset_detail_modal.html' %}
-{% endblock %}
-
-
-{% block custom_foot_js %}
-<script>
-var treeUrl = "{% url 'api-perms:my-nodes-children-as-tree' %}?cache_policy=1";
-var assetTableUrl = "{% url 'api-perms:my-assets' %}?cache_policy=1";
-var selectUrl = '{% url "api-perms:my-node-assets" node_id=DEFAULT_PK %}?cache_policy=1&all=1';
-var systemUsersUrl = "{% url 'api-perms:my-asset-system-users' asset_id=DEFAULT_PK %}?cache_policy=1";
-var showAssetHref = false; // Need input default true
-
-var favoriteAssets = [];
-var favorBtnTmpl = '<a class="btn btn-xs btn-default btn-favor" data-id="ID"><i class="fa fa-star-o"></i></a>';
-var disfavorBtnTmpl = '<a class="btn btn-xs btn-default btn-disfavor" data-id="ID"><i class="fa fa-star"></i></a>';
-var actions = {
-    targets: 4, createdCell: function (td, cellData) {
-       var connBtn = '<a href="{% url "luna-view" %}?login_to=' + cellData +
-           '" class="btn btn-xs btn-primary" target="_blank"><i class="fa fa-terminal"></i></a> ';
-       var favorBtn = favorBtnTmpl.replace("ID", cellData);
-       var disfavorBtn = disfavorBtnTmpl.replace("ID", cellData);
-
-       var btn = connBtn;
-       if (favoriteAssets.indexOf(cellData) === -1) {
-           btn += favorBtn
-       } else {
-           btn += disfavorBtn;
-       }
-
-       $(td).html(btn)
-}};
-$(document).ready(function () {
-    requestApi({
-        method: "GET",
-        url: "{% url 'api-assets:favorite-asset-list' %}",
-        success: function (data) {
-            favoriteAssets = data.map(function (i) {
-                return i.asset;
-            });
-            initTree();
-        },
-        error: function () {
-            initTree();
-        },
-        flash_message: false
-     })
-}).on('click', '.labels li', function () {
-    var val = $(this).text();
-    $("#user_assets_table_filter input").val(val);
-    assetTable.search(val).draw();
- })
-.on('click', '.asset-detail', function(e) {
-    e.preventDefault();
-    var data = assetTable.ajax.json();
-    var assetId = $(this).data("asset");
-    var trs = '';
-    var desc = {
-        'hostname': "{% trans 'Hostname' %}",
-        'ip': "{% trans 'IP' %}",
-        'protocols': "{% trans 'Protocols' %}",
-        'platform': "{% trans 'Platform' %}",
-        {#'system_users_join': "{% trans 'System user' %}",#}
-        'domain': "{% trans 'Domain' %}",
-        'comment': "{% trans 'Comment' %}",
-    };
-    var value;
-    for (var i = 0; i < data.results.length; i++) {
-        value = data.results[i];
-        if(value.id === assetId){
-            for(var i in desc){
-                trs += "<tr class='no-borders-tr'>\n" +
-                  "<td>"+ desc[i] + ":</td>"+
-                  "<td><b>"+ (value[i] === null?'':value[i]) + "</b></td>\n" +
-                  "</tr>";
-            }
-         break
-        }
-    };
-    $('#asset_detail_tbody').html(trs)
-    $('#user_asset_detail_modal').modal();
-})
-.on('click', '.btn-favor', function () {
-    var $this = $(this);
-    var assetId = $(this).data("id");
-    requestApi({
-        url: "{% url 'api-assets:favorite-asset-list' %}",
-        method: "POST",
-        body: JSON.stringify({asset: assetId}),
-        flash_message: false,
-        success: function (data) {
-            favoriteAssets.push(assetId);
-            var btn = disfavorBtnTmpl.replace("ID", assetId);
-            $this.replaceWith(btn)
-        }
-    });
-})
-.on('click', '.btn-disfavor', function () {
-    var $this = $(this);
-    var assetId = $(this).data("id");
-    requestApi({
-        url: "{% url 'api-assets:favorite-asset-list' %}?asset=" + assetId,
-        method: "DELETE",
-        flash_message: false,
-        success: function (data) {
-            var index = favoriteAssets.indexOf(assetId);
-            if (index !== '-1'){
-                favoriteAssets.splice(index, 1);
-            }
-            var btn = favorBtnTmpl.replace("ID", assetId);
-            $this.replaceWith(btn)
-        }
-    });
-});
-</script>
-{% endblock %}

apps/assets/templatetags/__init__.py

@@ -1,2 +0,0 @@
-# -*- coding: utf-8 -*-
-#

apps/assets/templatetags/asset_tags.py

@@ -1,12 +0,0 @@
-from collections import defaultdict
-
-from django import template
-register = template.Library()
-
-
-@register.filter
-def group_labels(queryset):
-    grouped = defaultdict(list)
-    for label in queryset:
-        grouped[label.name].append(label)
-    return [(name, labels) for name, labels in grouped.items()]

apps/assets/urls/views_urls.py

@@ -1,66 +1,6 @@
 # coding:utf-8
-from django.urls import path
-from .. import views
 
 app_name = 'assets'
 
 urlpatterns = [
-    # Resource asset url
-    path('', views.AssetListView.as_view(), name='asset-index'),
-    path('asset/', views.AssetListView.as_view(), name='asset-list'),
-    path('asset/create/', views.AssetCreateView.as_view(), name='asset-create'),
-    path('asset/<uuid:pk>/', views.AssetDetailView.as_view(), name='asset-detail'),
-    path('asset/<uuid:pk>/update/', views.AssetUpdateView.as_view(), name='asset-update'),
-    path('asset/<uuid:pk>/delete/', views.AssetDeleteView.as_view(), name='asset-delete'),
-    path('asset/update/', views.AssetBulkUpdateView.as_view(), name='asset-bulk-update'),
-    # Asset user view
-    path('asset/<uuid:pk>/asset-user/', views.AssetUserListView.as_view(), name='asset-user-list'),
-
-    path('platform/', views.PlatformListView.as_view(), name='platform-list'),
-    path('platform/create/', views.PlatformCreateView.as_view(), name='platform-create'),
-    path('platform/<int:pk>/', views.PlatformDetailView.as_view(), name='platform-detail'),
-    path('platform/<int:pk>/update/', views.PlatformUpdateView.as_view(), name='platform-update'),
-
-    # User asset view
-    path('user-asset/', views.UserAssetListView.as_view(), name='user-asset-list'),
-
-    # Resource admin user url
-    path('admin-user/', views.AdminUserListView.as_view(), name='admin-user-list'),
-    path('admin-user/create/', views.AdminUserCreateView.as_view(), name='admin-user-create'),
-    path('admin-user/<uuid:pk>/', views.AdminUserDetailView.as_view(), name='admin-user-detail'),
-    path('admin-user/<uuid:pk>/update/', views.AdminUserUpdateView.as_view(), name='admin-user-update'),
-    path('admin-user/<uuid:pk>/delete/', views.AdminUserDeleteView.as_view(), name='admin-user-delete'),
-    path('admin-user/<uuid:pk>/assets/', views.AdminUserAssetsView.as_view(), name='admin-user-assets'),
-
-    # Resource system user url
-    path('system-user/', views.SystemUserListView.as_view(), name='system-user-list'),
-    path('system-user/create/', views.SystemUserCreateView.as_view(), name='system-user-create'),
-    path('system-user/<uuid:pk>/', views.SystemUserDetailView.as_view(), name='system-user-detail'),
-    path('system-user/<uuid:pk>/update/', views.SystemUserUpdateView.as_view(), name='system-user-update'),
-    path('system-user/<uuid:pk>/delete/', views.SystemUserDeleteView.as_view(), name='system-user-delete'),
-    path('system-user/<uuid:pk>/asset/', views.SystemUserAssetView.as_view(), name='system-user-asset'),
-    path('system-user/<uuid:pk>/user/', views.SystemUserUserView.as_view(), name='system-user-user'),
-
-    path('label/', views.LabelListView.as_view(), name='label-list'),
-    path('label/create/', views.LabelCreateView.as_view(), name='label-create'),
-    path('label/<uuid:pk>/update/', views.LabelUpdateView.as_view(), name='label-update'),
-    path('label/<uuid:pk>/delete/', views.LabelDeleteView.as_view(), name='label-delete'),
-
-    path('domain/', views.DomainListView.as_view(), name='domain-list'),
-    path('domain/create/', views.DomainCreateView.as_view(), name='domain-create'),
-    path('domain/<uuid:pk>/', views.DomainDetailView.as_view(), name='domain-detail'),
-    path('domain/<uuid:pk>/update/', views.DomainUpdateView.as_view(), name='domain-update'),
-    path('domain/<uuid:pk>/delete/', views.DomainDeleteView.as_view(), name='domain-delete'),
-    path('domain/<uuid:pk>/gateway/', views.DomainGatewayListView.as_view(), name='domain-gateway-list'),
-
-    path('domain/<uuid:pk>/gateway/create/', views.DomainGatewayCreateView.as_view(), name='domain-gateway-create'),
-    path('domain/gateway/<uuid:pk>/update/', views.DomainGatewayUpdateView.as_view(), name='domain-gateway-update'),
-
-    path('cmd-filter/', views.CommandFilterListView.as_view(), name='cmd-filter-list'),
-    path('cmd-filter/create/', views.CommandFilterCreateView.as_view(), name='cmd-filter-create'),
-    path('cmd-filter/<uuid:pk>/update/', views.CommandFilterUpdateView.as_view(), name='cmd-filter-update'),
-    path('cmd-filter/<uuid:pk>/', views.CommandFilterDetailView.as_view(), name='cmd-filter-detail'),
-    path('cmd-filter/<uuid:pk>/rule/', views.CommandFilterRuleListView.as_view(), name='cmd-filter-rule-list'),
-    path('cmd-filter/<uuid:filter_pk>/rule/create/', views.CommandFilterRuleCreateView.as_view(), name='cmd-filter-rule-create'),
-    path('cmd-filter/<uuid:filter_pk>/rule/<uuid:pk>/update/', views.CommandFilterRuleUpdateView.as_view(), name='cmd-filter-rule-update'),
 ]

apps/assets/views/__init__.py

@@ -1,8 +0,0 @@
-# coding:utf-8
-from .asset import *
-from .platform import *
-from .system_user import *
-from .admin_user import *
-from .label import *
-from .domain import *
-from .cmd_filter import *

apps/assets/views/admin_user.py

@@ -1,121 +0,0 @@
-# coding:utf-8
-from __future__ import absolute_import, unicode_literals
-from django.utils.translation import ugettext as _
-from django.conf import settings
-from django.urls import reverse_lazy
-from django.views.generic import TemplateView, ListView
-from django.views.generic.edit import CreateView, DeleteView, UpdateView
-from django.contrib.messages.views import SuccessMessageMixin
-from django.views.generic.detail import DetailView, SingleObjectMixin
-
-from common.const import create_success_msg, update_success_msg
-from .. import forms
-from ..models import AdminUser, Node
-from common.permissions import PermissionsMixin, IsOrgAdmin
-
-__all__ = [
-    'AdminUserCreateView', 'AdminUserDetailView',
-    'AdminUserDeleteView', 'AdminUserListView',
-    'AdminUserUpdateView', 'AdminUserAssetsView',
-]
-
-
-class AdminUserListView(PermissionsMixin, TemplateView):
-    model = AdminUser
-    template_name = 'assets/admin_user_list.html'
-    permission_classes = [IsOrgAdmin]
-
-    def get_context_data(self, **kwargs):
-        context = {
-            'app': _('Assets'),
-            'action': _('Admin user list'),
-        }
-        kwargs.update(context)
-        return super().get_context_data(**kwargs)
-
-
-class AdminUserCreateView(PermissionsMixin,
-                          SuccessMessageMixin,
-                          CreateView):
-    model = AdminUser
-    form_class = forms.AdminUserForm
-    template_name = 'assets/admin_user_create_update.html'
-    success_url = reverse_lazy('assets:admin-user-list')
-    success_message = create_success_msg
-    permission_classes = [IsOrgAdmin]
-
-    def get_context_data(self, **kwargs):
-        context = {
-            'app': _('Assets'),
-            'action': _('Create admin user'),
-            "type": "create"
-        }
-        kwargs.update(context)
-        return super().get_context_data(**kwargs)
-
-
-class AdminUserUpdateView(PermissionsMixin, SuccessMessageMixin, UpdateView):
-    model = AdminUser
-    form_class = forms.AdminUserForm
-    template_name = 'assets/admin_user_create_update.html'
-    success_url = reverse_lazy('assets:admin-user-list')
-    success_message = update_success_msg
-    permission_classes = [IsOrgAdmin]
-
-    def get_context_data(self, **kwargs):
-        context = {
-            'app': _('Assets'),
-            'action': _('Update admin user'),
-            "type": "update"
-        }
-        kwargs.update(context)
-        return super().get_context_data(**kwargs)
-
-
-class AdminUserDetailView(PermissionsMixin, DetailView):
-    model = AdminUser
-    template_name = 'assets/admin_user_detail.html'
-    context_object_name = 'admin_user'
-    object = None
-    permission_classes = [IsOrgAdmin]
-
-    def get_context_data(self, **kwargs):
-        context = {
-            'app': _('Assets'),
-            'action': _('Admin user detail'),
-        }
-        kwargs.update(context)
-        return super().get_context_data(**kwargs)
-
-
-class AdminUserAssetsView(PermissionsMixin, SingleObjectMixin, ListView):
-    paginate_by = settings.DISPLAY_PER_PAGE
-    template_name = 'assets/admin_user_assets.html'
-    context_object_name = 'admin_user'
-    object = None
-    permission_classes = [IsOrgAdmin]
-
-    def get(self, request, *args, **kwargs):
-        self.object = self.get_object(queryset=AdminUser.objects.all())
-        return super().get(request, *args, **kwargs)
-
-    def get_queryset(self):
-        self.queryset = self.object.assets.all()
-        return self.queryset
-
-    def get_context_data(self, **kwargs):
-        context = {
-            'app': _('Assets'),
-            'action': _('Admin user assets'),
-        }
-        kwargs.update(context)
-        return super().get_context_data(**kwargs)
-
-
-class AdminUserDeleteView(PermissionsMixin, DeleteView):
-    model = AdminUser
-    template_name = 'delete_confirm.html'
-    success_url = reverse_lazy('assets:admin-user-list')
-    permission_classes = [IsOrgAdmin]
-
-

apps/assets/views/asset.py

@@ -1,203 +0,0 @@
-# coding:utf-8
-from __future__ import absolute_import, unicode_literals
-
-from django.contrib import messages
-from django.utils.translation import ugettext_lazy as _
-from django.views.generic import TemplateView, ListView
-from django.views.generic.edit import FormMixin
-from django.views.generic.edit import DeleteView, UpdateView
-from django.urls import reverse_lazy
-from django.views.generic.detail import DetailView
-from django.core.cache import cache
-from django.shortcuts import redirect
-from django.forms.formsets import formset_factory
-
-from common.utils import get_object_or_none, get_logger
-from common.permissions import PermissionsMixin, IsOrgAdmin, IsValidUser
-from common.const import KEY_CACHE_RESOURCES_ID
-from .. import forms
-from ..models import Asset, Label, Node
-
-
-__all__ = [
-    'AssetListView', 'AssetCreateView', 'AssetUpdateView', 'AssetUserListView',
-    'UserAssetListView', 'AssetBulkUpdateView', 'AssetDetailView',
-    'AssetDeleteView',
-]
-logger = get_logger(__file__)
-
-
-class AssetListView(PermissionsMixin, TemplateView):
-    template_name = 'assets/asset_list.html'
-    permission_classes = [IsOrgAdmin]
-
-    def get_context_data(self, **kwargs):
-        Node.org_root()
-        context = {
-            'app': _('Assets'),
-            'action': _('Asset list'),
-            'labels': Label.objects.all().order_by('name'),
-            'nodes': Node.objects.all().order_by('-key'),
-        }
-        kwargs.update(context)
-        return super().get_context_data(**kwargs)
-
-
-class AssetUserListView(PermissionsMixin, DetailView):
-    model = Asset
-    context_object_name = 'asset'
-    template_name = 'assets/asset_asset_user_list.html'
-    permission_classes = [IsOrgAdmin]
-
-    def get_context_data(self, **kwargs):
-        context = {
-            'app': _('Assets'),
-            'action': _('Asset user list'),
-        }
-        kwargs.update(context)
-        return super().get_context_data(**kwargs)
-
-
-class UserAssetListView(PermissionsMixin, TemplateView):
-    template_name = 'assets/user_asset_list.html'
-    permission_classes = [IsValidUser]
-
-    def get_context_data(self, **kwargs):
-        context = {
-            'action': _('My assets'),
-            'labels': Label.objects.all().order_by('name'),
-            'show_actions': True
-        }
-        kwargs.update(context)
-        return super().get_context_data(**kwargs)
-
-
-class AssetCreateView(PermissionsMixin, FormMixin, TemplateView):
-    model = Asset
-    form_class = forms.AssetCreateUpdateForm
-    template_name = 'assets/asset_create.html'
-    success_url = reverse_lazy('assets:asset-list')
-    permission_classes = [IsOrgAdmin]
-
-    def get_form(self, form_class=None):
-        form = super().get_form(form_class=form_class)
-        node_id = self.request.GET.get("node_id")
-        if node_id:
-            node = get_object_or_none(Node, id=node_id)
-        else:
-            node = Node.org_root()
-        form.add_nodes_initial(node)
-        return form
-
-    def get_protocol_formset(self):
-        ProtocolFormset = formset_factory(forms.ProtocolForm, extra=0, min_num=1, max_num=5)
-        if self.request.method == "POST":
-            formset = ProtocolFormset(self.request.POST)
-        else:
-            formset = ProtocolFormset()
-        return formset
-
-    def get_context_data(self, **kwargs):
-        formset = self.get_protocol_formset()
-        context = {
-            'app': _('Assets'),
-            'action': _('Create asset'),
-            'formset': formset,
-        }
-        kwargs.update(context)
-        return super().get_context_data(**kwargs)
-
-
-class AssetUpdateView(PermissionsMixin, UpdateView):
-    model = Asset
-    form_class = forms.AssetCreateUpdateForm
-    template_name = 'assets/asset_update.html'
-    success_url = reverse_lazy('assets:asset-list')
-    permission_classes = [IsOrgAdmin]
-
-    def get_protocol_formset(self):
-        ProtocolFormset = formset_factory(forms.ProtocolForm, extra=0, min_num=1, max_num=5)
-        if self.request.method == "POST":
-            formset = ProtocolFormset(self.request.POST)
-        else:
-            initial_data = self.object.protocols_as_json
-            formset = ProtocolFormset(initial=initial_data)
-        return formset
-
-    def get_context_data(self, **kwargs):
-        formset = self.get_protocol_formset()
-        context = {
-            'app': _('Assets'),
-            'action': _('Update asset'),
-            'formset': formset,
-        }
-        kwargs.update(context)
-        return super().get_context_data(**kwargs)
-
-
-class AssetBulkUpdateView(PermissionsMixin, ListView):
-    model = Asset
-    form_class = forms.AssetBulkUpdateForm
-    template_name = 'assets/asset_bulk_update.html'
-    success_url = reverse_lazy('assets:asset-list')
-    success_message = _("Bulk update asset success")
-    id_list = None
-    form = None
-    permission_classes = [IsOrgAdmin]
-
-    def get(self, request, *args, **kwargs):
-        spm = request.GET.get('spm', '')
-        assets_id = cache.get(KEY_CACHE_RESOURCES_ID.format(spm))
-        if kwargs.get('form'):
-            self.form = kwargs['form']
-        elif assets_id:
-            self.form = self.form_class(initial={'assets': assets_id})
-        else:
-            self.form = self.form_class()
-        return super().get(request, *args, **kwargs)
-
-    def post(self, request, *args, **kwargs):
-        form = self.form_class(request.POST)
-        if form.is_valid():
-            form.save()
-            messages.success(request, self.success_message)
-            return redirect(self.success_url)
-        else:
-            return self.get(request, form=form, *args, **kwargs)
-
-    def get_context_data(self, **kwargs):
-        context = {
-            'app': _('Assets'),
-            'action': _('Bulk update asset'),
-            'form': self.form,
-            'assets_selected': self.id_list,
-        }
-        kwargs.update(context)
-        return super().get_context_data(**kwargs)
-
-
-class AssetDeleteView(PermissionsMixin, DeleteView):
-    model = Asset
-    template_name = 'delete_confirm.html'
-    success_url = reverse_lazy('assets:asset-list')
-    permission_classes = [IsOrgAdmin]
-
-
-class AssetDetailView(PermissionsMixin, DetailView):
-    model = Asset
-    context_object_name = 'asset'
-    template_name = 'assets/asset_detail.html'
-    permission_classes = [IsValidUser]
-
-    def get_queryset(self):
-        return super().get_queryset().prefetch_related(
-            "nodes", "labels",
-        ).select_related('admin_user', 'domain')
-
-    def get_context_data(self, **kwargs):
-        context = {
-            'app': _('Assets'),
-            'action': _('Asset detail'),
-        }
-        kwargs.update(context)
-        return super().get_context_data(**kwargs)

apps/assets/views/cmd_filter.py

@@ -1,180 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-
-from django.views.generic import TemplateView, CreateView, \
-    UpdateView, DeleteView, DetailView
-from django.views.generic.detail import SingleObjectMixin
-from django.utils.translation import ugettext_lazy as _
-from django.urls import reverse_lazy
-from django.shortcuts import get_object_or_404, reverse
-
-from common.permissions import PermissionsMixin, IsOrgAdmin
-from common.const import create_success_msg, update_success_msg
-from ..models import CommandFilter, CommandFilterRule, SystemUser
-from ..forms import CommandFilterForm, CommandFilterRuleForm
-
-
-__all__ = (
-    "CommandFilterListView", "CommandFilterCreateView",
-    "CommandFilterUpdateView",
-    "CommandFilterRuleListView", "CommandFilterRuleCreateView",
-    "CommandFilterRuleUpdateView", "CommandFilterDetailView",
-)
-
-
-class CommandFilterListView(PermissionsMixin, TemplateView):
-    template_name = 'assets/cmd_filter_list.html'
-    permission_classes = [IsOrgAdmin]
-
-    def get_context_data(self, **kwargs):
-        context = {
-            'app': _('Assets'),
-            'action': _('Command filter list'),
-        }
-        kwargs.update(context)
-        return super().get_context_data(**kwargs)
-
-
-class CommandFilterCreateView(PermissionsMixin, CreateView):
-    model = CommandFilter
-    template_name = 'assets/cmd_filter_create_update.html'
-    form_class = CommandFilterForm
-    success_url = reverse_lazy('assets:cmd-filter-list')
-    success_message = create_success_msg
-    permission_classes = [IsOrgAdmin]
-
-    def get_context_data(self, **kwargs):
-        context = {
-            'app': _('Assets'),
-            'action': _('Create command filter'),
-            'type': 'create'
-        }
-        kwargs.update(context)
-        return super().get_context_data(**kwargs)
-
-
-class CommandFilterUpdateView(PermissionsMixin, UpdateView):
-    model = CommandFilter
-    template_name = 'assets/cmd_filter_create_update.html'
-    form_class = CommandFilterForm
-    success_url = reverse_lazy('assets:cmd-filter-list')
-    success_message = update_success_msg
-    permission_classes = [IsOrgAdmin]
-
-    def get_context_data(self, **kwargs):
-        context = {
-            'app': _('Assets'),
-            'action': _('Update command filter'),
-            'type': 'update'
-        }
-        kwargs.update(context)
-        return super().get_context_data(**kwargs)
-
-
-class CommandFilterDetailView(PermissionsMixin, DetailView):
-    model = CommandFilter
-    template_name = 'assets/cmd_filter_detail.html'
-    permission_classes = [IsOrgAdmin]
-
-    def get_context_data(self, **kwargs):
-        system_users_remain = SystemUser.objects\
-            .exclude(cmd_filters=self.object)\
-            .exclude(protocol='rdp')
-        context = {
-            'app': _('Assets'),
-            'action': _('Command filter detail'),
-            'system_users_remain': system_users_remain
-        }
-        kwargs.update(context)
-        return super().get_context_data(**kwargs)
-
-
-class CommandFilterRuleListView(PermissionsMixin, SingleObjectMixin, TemplateView):
-    template_name = 'assets/cmd_filter_rule_list.html'
-    model = CommandFilter
-    object = None
-    permission_classes = [IsOrgAdmin]
-
-    def get(self, request, *args, **kwargs):
-        self.object = self.get_object(queryset=self.model.objects.all())
-        return super().get(request, *args, **kwargs)
-
-    def get_context_data(self, **kwargs):
-        context = {
-            'app': _('Assets'),
-            'action': _('Command filter rule list'),
-            'object': self.get_object()
-        }
-        kwargs.update(context)
-        return super().get_context_data(**kwargs)
-
-
-class CommandFilterRuleCreateView(PermissionsMixin, CreateView):
-    template_name = 'assets/cmd_filter_rule_create_update.html'
-    model = CommandFilterRule
-    form_class = CommandFilterRuleForm
-    success_message = create_success_msg
-    cmd_filter = None
-    permission_classes = [IsOrgAdmin]
-
-    def get_success_url(self):
-        return reverse('assets:cmd-filter-rule-list', kwargs={
-            'pk': self.cmd_filter.id
-        })
-
-    def get_form(self, form_class=None):
-        form = super().get_form(form_class=form_class)
-        form['filter'].initial = self.cmd_filter
-        form['filter'].field.widget.attrs['readonly'] = 1
-        return form
-
-    def dispatch(self, request, *args, **kwargs):
-        filter_pk = self.kwargs.get('filter_pk')
-        self.cmd_filter = get_object_or_404(CommandFilter, pk=filter_pk)
-        return super().dispatch(request, *args, **kwargs)
-
-    def get_context_data(self, **kwargs):
-        context = {
-            'app': _('Assets'),
-            'action': _('Create command filter rule'),
-            'object': self.cmd_filter,
-            'request_type': 'create'
-        }
-        kwargs.update(context)
-        return super().get_context_data(**kwargs)
-
-
-class CommandFilterRuleUpdateView(PermissionsMixin, UpdateView):
-    template_name = 'assets/cmd_filter_rule_create_update.html'
-    model = CommandFilterRule
-    form_class = CommandFilterRuleForm
-    success_message = create_success_msg
-    cmd_filter = None
-    permission_classes = [IsOrgAdmin]
-
-    def get_success_url(self):
-        return reverse('assets:cmd-filter-rule-list', kwargs={
-            'pk': self.cmd_filter.id
-        })
-
-    def get_form(self, form_class=None):
-        form = super().get_form(form_class=form_class)
-        form['filter'].initial = self.cmd_filter
-        form['filter'].field.widget.attrs['readonly'] = 1
-        return form
-
-    def dispatch(self, request, *args, **kwargs):
-        filter_pk = self.kwargs.get('filter_pk')
-        self.cmd_filter = get_object_or_404(CommandFilter, pk=filter_pk)
-        return super().dispatch(request, *args, **kwargs)
-
-    def get_context_data(self, **kwargs):
-        context = {
-            'app': _('Assets'),
-            'action': _('Update command filter rule'),
-            'object': self.cmd_filter,
-            'rule': self.get_object(),
-            'request_type': 'update'
-        }
-        kwargs.update(context)
-        return super().get_context_data(**kwargs)

apps/assets/views/domain.py

@@ -1,162 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-
-from django.views.generic import (
-    TemplateView, CreateView, UpdateView, DeleteView, DetailView
-)
-from django.views.generic.detail import SingleObjectMixin
-from django.utils.translation import ugettext_lazy as _
-from django.urls import reverse_lazy, reverse
-
-from common.permissions import PermissionsMixin, IsOrgAdmin
-from common.const import create_success_msg, update_success_msg
-from common.utils import get_object_or_none
-from ..models import Domain, Gateway
-from ..forms import DomainForm, GatewayForm
-
-
-__all__ = (
-    "DomainListView", "DomainCreateView", "DomainUpdateView",
-    "DomainDetailView", "DomainDeleteView", "DomainGatewayListView",
-    "DomainGatewayCreateView", 'DomainGatewayUpdateView',
-)
-
-
-class DomainListView(PermissionsMixin, TemplateView):
-    template_name = 'assets/domain_list.html'
-    permission_classes = [IsOrgAdmin]
-
-    def get_context_data(self, **kwargs):
-        context = {
-            'app': _('Assets'),
-            'action': _('Domain list'),
-        }
-        kwargs.update(context)
-        return super().get_context_data(**kwargs)
-
-
-class DomainCreateView(PermissionsMixin, CreateView):
-    model = Domain
-    template_name = 'assets/domain_create_update.html'
-    form_class = DomainForm
-    success_url = reverse_lazy('assets:domain-list')
-    success_message = create_success_msg
-    permission_classes = [IsOrgAdmin]
-
-    def get_context_data(self, **kwargs):
-        context = {
-            'app': _('Assets'),
-            'action': _('Create domain'),
-            'type': 'create'
-        }
-        kwargs.update(context)
-        return super().get_context_data(**kwargs)
-
-
-class DomainUpdateView(PermissionsMixin, UpdateView):
-    model = Domain
-    template_name = 'assets/domain_create_update.html'
-    form_class = DomainForm
-    success_url = reverse_lazy('assets:domain-list')
-    success_message = update_success_msg
-    permission_classes = [IsOrgAdmin]
-
-    def get_context_data(self, **kwargs):
-        context = {
-            'app': _('Assets'),
-            'action': _('Update domain'),
-            'type': 'update'
-        }
-        kwargs.update(context)
-        return super().get_context_data(**kwargs)
-
-
-class DomainDetailView(PermissionsMixin, DetailView):
-    model = Domain
-    template_name = 'assets/domain_detail.html'
-    permission_classes = [IsOrgAdmin]
-
-    def get_context_data(self, **kwargs):
-        context = {
-            'app': _('Assets'),
-            'action': _('Domain detail'),
-        }
-        kwargs.update(context)
-        return super().get_context_data(**kwargs)
-
-
-class DomainDeleteView(PermissionsMixin, DeleteView):
-    model = Domain
-    template_name = 'delete_confirm.html'
-    success_url = reverse_lazy('assets:domain-list')
-    permission_classes = [IsOrgAdmin]
-
-
-class DomainGatewayListView(PermissionsMixin, SingleObjectMixin, TemplateView):
-    template_name = 'assets/domain_gateway_list.html'
-    model = Domain
-    object = None
-    permission_classes = [IsOrgAdmin]
-
-    def get(self, request, *args, **kwargs):
-        self.object = self.get_object(queryset=self.model.objects.all())
-        return super().get(request, *args, **kwargs)
-
-    def get_context_data(self, **kwargs):
-        context = {
-            'app': _('Assets'),
-            'action': _('Domain gateway list'),
-            'object': self.get_object()
-        }
-        kwargs.update(context)
-        return super().get_context_data(**kwargs)
-
-
-class DomainGatewayCreateView(PermissionsMixin, CreateView):
-    model = Gateway
-    template_name = 'assets/gateway_create_update.html'
-    form_class = GatewayForm
-    success_message = create_success_msg
-    permission_classes = [IsOrgAdmin]
-
-    def get_success_url(self):
-        domain = self.object.domain
-        return reverse('assets:domain-gateway-list', kwargs={"pk": domain.id})
-
-    def get_form(self, form_class=None):
-        form = super().get_form(form_class=form_class)
-        domain_id = self.kwargs.get("pk")
-        domain = get_object_or_none(Domain, id=domain_id)
-        if domain:
-            form['domain'].initial = domain
-        return form
-
-    def get_context_data(self, **kwargs):
-        context = {
-            'app': _('Assets'),
-            'action': _('Create gateway'),
-            'type': 'create'
-        }
-        kwargs.update(context)
-        return super().get_context_data(**kwargs)
-
-
-class DomainGatewayUpdateView(PermissionsMixin, UpdateView):
-    model = Gateway
-    template_name = 'assets/gateway_create_update.html'
-    form_class = GatewayForm
-    success_message = update_success_msg
-    permission_classes = [IsOrgAdmin]
-
-    def get_success_url(self):
-        domain = self.object.domain
-        return reverse('assets:domain-gateway-list', kwargs={"pk": domain.id})
-
-    def get_context_data(self, **kwargs):
-        context = {
-            'app': _('Assets'),
-            'action': _('Update gateway'),
-            "type": "update"
-        }
-        kwargs.update(context)
-        return super().get_context_data(**kwargs)

apps/assets/views/label.py

@@ -1,89 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-
-from django.views.generic import TemplateView, CreateView, \
-    UpdateView, DeleteView, DetailView
-from django.utils.translation import ugettext_lazy as _
-from django.urls import reverse_lazy
-
-from common.permissions import PermissionsMixin, IsOrgAdmin
-from common.const import create_success_msg, update_success_msg
-from ..models import Label
-from ..forms import LabelForm
-
-
-__all__ = (
-    "LabelListView", "LabelCreateView", "LabelUpdateView",
-    "LabelDetailView", "LabelDeleteView",
-)
-
-
-class LabelListView(PermissionsMixin, TemplateView):
-    template_name = 'assets/label_list.html'
-    permission_classes = [IsOrgAdmin]
-
-    def get_context_data(self, **kwargs):
-        context = {
-            'app': _('Assets'),
-            'action': _('Label list'),
-        }
-        kwargs.update(context)
-        return super().get_context_data(**kwargs)
-
-
-class LabelCreateView(PermissionsMixin, CreateView):
-    model = Label
-    template_name = 'assets/label_create_update.html'
-    form_class = LabelForm
-    success_url = reverse_lazy('assets:label-list')
-    success_message = create_success_msg
-    disable_name = ['draw', 'search', 'limit', 'offset', '_']
-    permission_classes = [IsOrgAdmin]
-
-    def get_context_data(self, **kwargs):
-        context = {
-            'app': _('Assets'),
-            'action': _('Create label'),
-            'type': 'create'
-        }
-        kwargs.update(context)
-        return super().get_context_data(**kwargs)
-
-    def form_valid(self, form):
-        name = form.cleaned_data.get('name')
-        if name in self.disable_name:
-            msg = _(
-                'Tips: Avoid using label names reserved internally: {}'
-            ).format(', '.join(self.disable_name))
-            form.add_error("name", msg)
-            return self.form_invalid(form)
-        return super().form_valid(form)
-
-
-class LabelUpdateView(PermissionsMixin, UpdateView):
-    model = Label
-    template_name = 'assets/label_create_update.html'
-    form_class = LabelForm
-    success_url = reverse_lazy('assets:label-list')
-    success_message = update_success_msg
-    permission_classes = [IsOrgAdmin]
-
-    def get_context_data(self, **kwargs):
-        context = {
-            'app': _('Assets'),
-            'action': _('Update label'),
-            'type': 'update'
-        }
-        kwargs.update(context)
-        return super().get_context_data(**kwargs)
-
-
-class LabelDetailView(PermissionsMixin, DetailView):
-    pass
-
-
-class LabelDeleteView(PermissionsMixin, DeleteView):
-    model = Label
-    template_name = 'delete_confirm.html'
-    success_url = reverse_lazy('assets:label-list')
-    permission_classes = [IsOrgAdmin]

apps/assets/views/platform.py

@@ -1,77 +0,0 @@
-# -*- coding: utf-8 -*-
-from django.views import generic
-from django.utils.translation import ugettext as _
-
-from common.permissions import PermissionsMixin, IsSuperUser
-from ..models import Platform
-from ..forms import PlatformForm, PlatformMetaForm
-
-__all__ = [
-    'PlatformListView', 'PlatformUpdateView', 'PlatformCreateView',
-    'PlatformDetailView',
-]
-
-
-class PlatformListView(PermissionsMixin, generic.TemplateView):
-    template_name = 'assets/platform_list.html'
-    permission_classes = (IsSuperUser,)
-
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        context.update({
-            'app': _('Assets'),
-            'action': _("Platform list"),
-        })
-        return context
-
-
-class PlatformCreateView(PermissionsMixin, generic.CreateView):
-    form_class = PlatformForm
-    permission_classes = (IsSuperUser,)
-    template_name = 'assets/platform_create_update.html'
-    model = Platform
-
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        meta_form = PlatformMetaForm()
-        context.update({
-            'app': _('Assets'),
-            'action': _("Create platform"),
-            'meta_form': meta_form,
-        })
-        return context
-
-
-class PlatformUpdateView(generic.UpdateView):
-    form_class = PlatformForm
-    permission_classes = (IsSuperUser,)
-    model = Platform
-    template_name = 'assets/platform_create_update.html'
-
-    def post(self, *args, **kwargs):
-        pass
-
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        meta_form = PlatformMetaForm(initial=self.object.meta)
-        context.update({
-            'app': _('Assets'),
-            'action': _("Update platform"),
-            'type': 'update',
-            'meta_form': meta_form,
-        })
-        return context
-
-
-class PlatformDetailView(generic.DetailView):
-    permission_classes = (IsSuperUser,)
-    model = Platform
-    template_name = 'assets/platform_detail.html'
-
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        context.update({
-            'app': _('Assets'),
-            'action': _("Platform detail"),
-        })
-        return context

apps/assets/views/system_user.py

@@ -1,122 +0,0 @@
-# ~*~ coding: utf-8 ~*~
-
-from django.utils.translation import ugettext as _
-from django.views.generic import TemplateView
-from django.views.generic.edit import CreateView, DeleteView, UpdateView
-from django.urls import reverse_lazy
-from django.contrib.messages.views import SuccessMessageMixin
-from django.views.generic.detail import DetailView
-
-from common.const import create_success_msg, update_success_msg
-from ..forms import SystemUserForm
-from ..models import SystemUser, Node, CommandFilter
-from common.permissions import PermissionsMixin, IsOrgAdmin
-
-
-__all__ = [
-    'SystemUserCreateView', 'SystemUserUpdateView',
-    'SystemUserDetailView', 'SystemUserDeleteView',
-    'SystemUserAssetView', 'SystemUserListView',
-    'SystemUserUserView',
-]
-
-
-class SystemUserListView(PermissionsMixin, TemplateView):
-    template_name = 'assets/system_user_list.html'
-    permission_classes = [IsOrgAdmin]
-
-    def get_context_data(self, **kwargs):
-        context = {
-            'app': _('Assets'),
-            'action': _('System user list'),
-        }
-        kwargs.update(context)
-        return super().get_context_data(**kwargs)
-
-
-class SystemUserCreateView(PermissionsMixin, SuccessMessageMixin, CreateView):
-    model = SystemUser
-    form_class = SystemUserForm
-    template_name = 'assets/system_user_create.html'
-    success_url = reverse_lazy('assets:system-user-list')
-    success_message = create_success_msg
-    permission_classes = [IsOrgAdmin]
-
-    def get_context_data(self, **kwargs):
-        context = {
-            'app': _('Assets'),
-            'action': _('Create system user'),
-        }
-        kwargs.update(context)
-        return super().get_context_data(**kwargs)
-
-
-class SystemUserUpdateView(PermissionsMixin, SuccessMessageMixin, UpdateView):
-    model = SystemUser
-    form_class = SystemUserForm
-    template_name = 'assets/system_user_update.html'
-    success_url = reverse_lazy('assets:system-user-list')
-    success_message = update_success_msg
-    permission_classes = [IsOrgAdmin]
-
-    def get_context_data(self, **kwargs):
-        context = {
-            'app': _('Assets'),
-            'action': _('Update system user')
-        }
-        kwargs.update(context)
-        return super().get_context_data(**kwargs)
-
-
-class SystemUserDetailView(PermissionsMixin, DetailView):
-    template_name = 'assets/system_user_detail.html'
-    context_object_name = 'system_user'
-    model = SystemUser
-    permission_classes = [IsOrgAdmin]
-
-    def get_context_data(self, **kwargs):
-        cmd_filters_remain = CommandFilter.objects.exclude(system_users=self.object)
-        context = {
-            'app': _('Assets'),
-            'action': _('System user detail'),
-            'cmd_filters_remain': cmd_filters_remain,
-        }
-        kwargs.update(context)
-        return super().get_context_data(**kwargs)
-
-
-class SystemUserDeleteView(PermissionsMixin, DeleteView):
-    model = SystemUser
-    template_name = 'delete_confirm.html'
-    success_url = reverse_lazy('assets:system-user-list')
-    permission_classes = [IsOrgAdmin]
-
-
-class SystemUserAssetView(PermissionsMixin, DetailView):
-    model = SystemUser
-    template_name = 'assets/system_user_assets.html'
-    context_object_name = 'system_user'
-    permission_classes = [IsOrgAdmin]
-
-    def get_context_data(self, **kwargs):
-        context = {
-            'app': _('assets'),
-            'action': _('System user assets'),
-        }
-        kwargs.update(context)
-        return super().get_context_data(**kwargs)
-
-
-class SystemUserUserView(PermissionsMixin, DetailView):
-    model = SystemUser
-    template_name = 'assets/system_user_users.html'
-    context_object_name = 'system_user'
-    permission_classes = [IsOrgAdmin]
-
-    def get_context_data(self, **kwargs):
-        context = {
-            'app': _('assets'),
-            'action': _('System user users'),
-        }
-        kwargs.update(context)
-        return super().get_context_data(**kwargs)

apps/audits/api.py

@@ -1,14 +1,124 @@
 # -*- coding: utf-8 -*-
 #
+from rest_framework.mixins import ListModelMixin, CreateModelMixin
+from django.db.models import F, Value
+from django.db.models.functions import Concat
 
-from common.permissions import IsOrgAdminOrAppUser, IsOrgAuditor
-from orgs.mixins.api import OrgModelViewSet
-from .models import FTPLog
-from .serializers import FTPLogSerializer
+from common.permissions import IsOrgAdminOrAppUser, IsOrgAuditor, IsOrgAdmin
+from common.drf.filters import DatetimeRangeFilter
+from common.api import CommonGenericViewSet
+from orgs.mixins.api import OrgGenericViewSet, OrgBulkModelViewSet, OrgRelationMixin
+from orgs.utils import current_org
+from ops.models import CommandExecution
+from .models import FTPLog, UserLoginLog, OperateLog, PasswordChangeLog
+from .serializers import FTPLogSerializer, UserLoginLogSerializer, CommandExecutionSerializer
+from .serializers import OperateLogSerializer, PasswordChangeLogSerializer, CommandExecutionHostsRelationSerializer
 
 
-class FTPLogViewSet(OrgModelViewSet):
+class FTPLogViewSet(CreateModelMixin,
+                    ListModelMixin,
+                    OrgGenericViewSet):
     model = FTPLog
     serializer_class = FTPLogSerializer
     permission_classes = (IsOrgAdminOrAppUser | IsOrgAuditor,)
-    http_method_names = ['get', 'post', 'head', 'options']
+    extra_filter_backends = [DatetimeRangeFilter]
+    date_range_filter_fields = [
+        ('date_start', ('date_from', 'date_to'))
+    ]
+    filter_fields = ['user', 'asset', 'system_user', 'filename']
+    search_fields = filter_fields
+
+
+class UserLoginLogViewSet(ListModelMixin, CommonGenericViewSet):
+    queryset = UserLoginLog.objects.all()
+    permission_classes = [IsOrgAdmin | IsOrgAuditor]
+    serializer_class = UserLoginLogSerializer
+    extra_filter_backends = [DatetimeRangeFilter]
+    date_range_filter_fields = [
+        ('datetime', ('date_from', 'date_to'))
+    ]
+    filter_fields = ['username', 'ip', 'city', 'type', 'status', 'mfa']
+    search_fields =['username', 'ip', 'city']
+
+    @staticmethod
+    def get_org_members():
+        users = current_org.get_org_members().values_list('username', flat=True)
+        return users
+
+    def get_queryset(self):
+        queryset = super().get_queryset()
+        if not current_org.is_default():
+            users = self.get_org_members()
+            queryset = queryset.filter(username__in=users)
+        return queryset
+
+
+class OperateLogViewSet(ListModelMixin, OrgGenericViewSet):
+    model = OperateLog
+    serializer_class = OperateLogSerializer
+    permission_classes = [IsOrgAdmin | IsOrgAuditor]
+    extra_filter_backends = [DatetimeRangeFilter]
+    date_range_filter_fields = [
+        ('datetime', ('date_from', 'date_to'))
+    ]
+    filter_fields = ['user', 'action', 'resource_type', 'resource', 'remote_addr']
+    search_fields = ['resource']
+    ordering = ['-datetime']
+
+
+class PasswordChangeLogViewSet(ListModelMixin, CommonGenericViewSet):
+    queryset = PasswordChangeLog.objects.all()
+    permission_classes = [IsOrgAdmin | IsOrgAuditor]
+    serializer_class = PasswordChangeLogSerializer
+    extra_filter_backends = [DatetimeRangeFilter]
+    date_range_filter_fields = [
+        ('datetime', ('date_from', 'date_to'))
+    ]
+    filter_fields = ['user', 'change_by', 'remote_addr']
+    ordering = ['-datetime']
+
+    def get_queryset(self):
+        users = current_org.get_org_members()
+        queryset = super().get_queryset().filter(
+            user__in=[user.__str__() for user in users]
+        )
+        return queryset
+
+
+class CommandExecutionViewSet(ListModelMixin, OrgGenericViewSet):
+    model = CommandExecution
+    serializer_class = CommandExecutionSerializer
+    permission_classes = [IsOrgAdmin | IsOrgAuditor]
+    extra_filter_backends = [DatetimeRangeFilter]
+    date_range_filter_fields = [
+        ('date_start', ('date_from', 'date_to'))
+    ]
+    filter_fields = ['user__name', 'command', 'run_as__name', 'is_finished']
+    search_fields = ['command', 'user__name', 'run_as__name']
+    ordering = ['-date_created']
+
+    def get_queryset(self):
+        queryset = super().get_queryset()
+        queryset = queryset.filter(run_as__org_id=current_org.org_id())
+        return queryset
+
+
+class CommandExecutionHostRelationViewSet(OrgRelationMixin, OrgBulkModelViewSet):
+    serializer_class = CommandExecutionHostsRelationSerializer
+    m2m_field = CommandExecution.hosts.field
+    permission_classes = (IsOrgAdmin,)
+    filter_fields = [
+        'id', 'asset', 'commandexecution'
+    ]
+    search_fields = ('asset__hostname', )
+    http_method_names = ['options', 'get']
+
+    def get_queryset(self):
+        queryset = super().get_queryset()
+        queryset = queryset.annotate(
+            asset_display=Concat(
+                F('asset__hostname'), Value('('),
+                F('asset__ip'), Value(')')
+            )
+        )
+        return queryset

apps/audits/filters.py

@@ -0,0 +1,32 @@
+from rest_framework import filters
+from rest_framework.compat import coreapi, coreschema
+
+from orgs.utils import current_org
+
+
+__all__ = ['CurrentOrgMembersFilter']
+
+
+class CurrentOrgMembersFilter(filters.BaseFilterBackend):
+    def get_schema_fields(self, view):
+        return [
+            coreapi.Field(
+                name='user', location='query', required=False, type='string',
+                schema=coreschema.String(
+                    title='user',
+                    description='user'
+                )
+            )
+        ]
+
+    def _get_user_list(self):
+        users = current_org.get_org_members(exclude=('Auditor',))
+        return users
+
+    def filter_queryset(self, request, queryset, view):
+        user_id = request.GET.get('user')
+        if user_id:
+            queryset = queryset.filter(user=user_id)
+        else:
+            queryset = queryset.filter(user__in=self._get_user_list())
+        return queryset

apps/audits/migrations/0008_auto_20200508_2105.py

@@ -0,0 +1,28 @@
+# Generated by Django 2.2.10 on 2020-05-08 13:05
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('audits', '0007_auto_20191202_1010'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='ftplog',
+            name='date_start',
+            field=models.DateTimeField(auto_now_add=True, verbose_name='Date start'),
+        ),
+        migrations.AlterField(
+            model_name='operatelog',
+            name='datetime',
+            field=models.DateTimeField(auto_now=True, verbose_name='Datetime'),
+        ),
+        migrations.AlterField(
+            model_name='passwordchangelog',
+            name='datetime',
+            field=models.DateTimeField(auto_now=True, verbose_name='Datetime'),
+        ),
+    ]

apps/audits/models.py

@@ -22,7 +22,7 @@ class FTPLog(OrgModelMixin):
     operate = models.CharField(max_length=16, verbose_name=_("Operate"))
     filename = models.CharField(max_length=1024, verbose_name=_("Filename"))
     is_success = models.BooleanField(default=True, verbose_name=_("Success"))
-    date_start = models.DateTimeField(auto_now_add=True)
+    date_start = models.DateTimeField(auto_now_add=True, verbose_name=_('Date start'))
 
 
 class OperateLog(OrgModelMixin):
@@ -40,7 +40,7 @@ class OperateLog(OrgModelMixin):
     resource_type = models.CharField(max_length=64, verbose_name=_("Resource Type"))
     resource = models.CharField(max_length=128, verbose_name=_("Resource"))
     remote_addr = models.CharField(max_length=128, verbose_name=_("Remote addr"), blank=True, null=True)
-    datetime = models.DateTimeField(auto_now=True)
+    datetime = models.DateTimeField(auto_now=True, verbose_name=_('Datetime'))
 
     def __str__(self):
         return "<{}> {} <{}>".format(self.user, self.action, self.resource)
@@ -51,7 +51,7 @@ class PasswordChangeLog(models.Model):
     user = models.CharField(max_length=128, verbose_name=_('User'))
     change_by = models.CharField(max_length=128, verbose_name=_("Change by"))
     remote_addr = models.CharField(max_length=128, verbose_name=_("Remote addr"), blank=True, null=True)
-    datetime = models.DateTimeField(auto_now=True)
+    datetime = models.DateTimeField(auto_now=True, verbose_name=_('Datetime'))
 
     def __str__(self):
         return "{} change {}'s password".format(self.change_by, self.user)

apps/audits/serializers.py

@@ -1,9 +1,13 @@
 # -*- coding: utf-8 -*-
 #
-
+from django.utils.translation import ugettext_lazy as _
 from rest_framework import serializers
+from django.db.models import F
 
+from common.mixins import BulkSerializerMixin
+from common.serializers import AdaptedBulkListSerializer
 from terminal.models import Session
+from ops.models import CommandExecution
 from . import models
 
 
@@ -11,25 +15,40 @@ class FTPLogSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = models.FTPLog
-        fields = '__all__'
+        fields = (
+            'id', 'user', 'remote_addr', 'asset', 'system_user',
+            'operate', 'filename', 'is_success', 'date_start'
+        )
 
 
-class LoginLogSerializer(serializers.ModelSerializer):
+class UserLoginLogSerializer(serializers.ModelSerializer):
+    type_display = serializers.ReadOnlyField(source='get_type_display')
+    status_display = serializers.ReadOnlyField(source='get_status_display')
+    mfa_display = serializers.ReadOnlyField(source='get_mfa_display')
+
     class Meta:
         model = models.UserLoginLog
-        fields = '__all__'
+        fields = (
+            'id', 'username', 'type', 'type_display', 'ip', 'city', 'user_agent',
+            'mfa', 'reason', 'status', 'status_display', 'datetime', 'mfa_display'
+        )
 
 
 class OperateLogSerializer(serializers.ModelSerializer):
     class Meta:
         model = models.OperateLog
-        fields = '__all__'
+        fields = (
+            'id', 'user', 'action', 'resource_type', 'resource',
+            'remote_addr', 'datetime'
+        )
 
 
 class PasswordChangeLogSerializer(serializers.ModelSerializer):
     class Meta:
         model = models.PasswordChangeLog
-        fields = '__all__'
+        fields = (
+           'id', 'user', 'change_by', 'remote_addr', 'datetime'
+        )
 
 
 class SessionAuditSerializer(serializers.ModelSerializer):
@@ -37,3 +56,41 @@ class SessionAuditSerializer(serializers.ModelSerializer):
         model = Session
         fields = '__all__'
 
+
+class CommandExecutionSerializer(serializers.ModelSerializer):
+    is_success = serializers.BooleanField(read_only=True, label=_('Is success'))
+
+    class Meta:
+        model = CommandExecution
+        fields_mini = ['id']
+        fields_small = fields_mini + [
+            'run_as', 'command', 'user', 'is_finished',
+            'date_start', 'result', 'is_success'
+        ]
+        fields = fields_small + ['hosts', 'run_as_display', 'user_display']
+        extra_kwargs = {
+            'result': {'label': _('Result')},  # model 上的方法，只能在这修改
+            'is_success': {'label': _('Is success')},
+            'hosts': {'label': _('Hosts')},  # 外键，会生成 sql。不在 model 上修改
+            'run_as': {'label': _('Run as')},
+            'user': {'label': _('User')},
+        }
+
+    @classmethod
+    def setup_eager_loading(cls, queryset):
+        """ Perform necessary eager loading of data. """
+        queryset = queryset.annotate(user_display=F('user__name'))\
+            .annotate(run_as_display=F('run_as__name'))
+        return queryset
+
+
+class CommandExecutionHostsRelationSerializer(BulkSerializerMixin, serializers.ModelSerializer):
+    asset_display = serializers.ReadOnlyField()
+    commandexecution_display = serializers.ReadOnlyField()
+
+    class Meta:
+        list_serializer_class = AdaptedBulkListSerializer
+        model = CommandExecution.hosts.through
+        fields = [
+            'id', 'asset', 'asset_display', 'commandexecution', 'commandexecution_display'
+        ]

apps/audits/templates/audits/ftp_log_list.html

@@ -1,138 +0,0 @@
-{% extends '_base_list.html' %}
-{% load i18n %}
-{% load static %}
-{% load terminal_tags %}
-{% load common_tags %}
-{% block custom_head_css_js %}
-    <link href="{% static 'css/plugins/datepicker/datepicker3.css' %}" rel="stylesheet">
-    <style>
-        #search_btn {
-            margin-bottom: 0;
-        }
-        .form-control {
-            height: 30px;
-        }
-        .select2-selection__rendered span.select2-selection, .select2-container .select2-selection--single {
-            height: 30px !important;
-        }
-    </style>
-{% endblock %}
-
-{% block content_left_head %}
-{% endblock %}
-
-
-{% block table_search %}
-    <form id="search_form" method="get" action="" class="pull-right form-inline">
-        <div class="form-group" id="date">
-            <div class="input-daterange input-group" id="datepicker">
-                <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                <input type="text" class="input-sm form-control" style="width: 100px;" name="date_from" value="{{ date_from|date:'Y-m-d' }}">
-                <span class="input-group-addon">to</span>
-                <input type="text" class="input-sm form-control" style="width: 100px;" name="date_to" value="{{ date_to|date:'Y-m-d' }}">
-            </div>
-        </div>
-        <div class="input-group">
-            <select class="select2 form-control" name="user">
-                <option value="">{% trans 'User' %}</option>
-                {% for u in user_list %}
-                    <option value="{{ u }}" {% if u == user %} selected {% endif %}>{{ u }}</option>
-                {% endfor %}
-            </select>
-        </div>
-        <div class="input-group">
-            <select class="select2 form-control" name="asset">
-                <option value="">{% trans 'Asset' %}</option>
-                {% for a in asset_list %}
-                    <option value="{{ a }}" {% if a == asset %} selected {% endif %}>{{ a }}</option>
-                {% endfor %}
-            </select>
-        </div>
-        <div class="input-group">
-            <select class="select2 form-control" name="system_user">
-                <option value="">{% trans 'System user' %}</option>
-                {% for su in system_user_list %}
-                    <option value="{{ su }}" {% if su == system_user %} selected {% endif %}>{{ su }}</option>
-                {% endfor %}
-            </select>
-        </div>
-        <div class="input-group">
-            <input type="text" class="form-control input-sm" name="filename" placeholder="{% trans 'Filename' %}" value="{{ filename }}">
-        </div>
-        <div class="input-group">
-            <div class="input-group-btn">
-                <button id='search_btn' type="submit" class="btn btn-sm btn-primary">
-                    搜索
-                </button>
-            </div>
-        </div>
-    </form>
-{% endblock %}
-
-{% block table_head %}
-{#    <th class="text-center">{% trans 'ID' %}</th>#}
-    <th class="text-center">{% trans 'User' %}</th>
-    <th class="text-center">{% trans 'Asset' %}</th>
-    <th class="text-center">{% trans 'System user' %}</th>
-    <th class="text-center">{% trans 'Remote addr' %}</th>
-    <th class="text-center">{% trans 'Operate' %}</th>
-    <th class="text-center">{% trans 'Filename' %}</th>
-    <th class="text-center">{% trans 'Success' %}</th>
-    <th class="text-center">{% trans 'Date start' %}</th>
-{#    <th class="text-center">{% trans 'Action' %}</th>#}
-{% endblock %}
-
-{% block table_body %}
-    {% for object in object_list %}
-        <tr class="gradeX">
-{#            <td class="text-center">#}
-{#                <a href="{% url 'terminal:object-detail' pk=object.id %}">{{ forloop.counter }}</a>#}
-{#            </td>#}
-            <td class="text-center">{{ object.user }}</td>
-            <td class="text-center">{{ object.asset }}</td>
-            <td class="text-center">{{ object.system_user }}</td>
-            <td class="text-center">{{ object.remote_addr|default:"" }}</td>
-            <td class="text-center">{{ object.operate }}</td>
-            <td class="text-center">{{ object.filename }}</td>
-            <td class="text-center">
-                {% if object.is_success %}
-                    <i class="fa fa-check text-navy"></i>
-                {% else %}
-                    <i class="fa fa-times text-danger"></i>
-                {% endif %}
-            </td>
-            <td class="text-center">{{ object.date_start }}</td>
-        </tr>
-    {% endfor %}
-{% endblock %}
-
-{% block content_bottom_left %}
-{% endblock %}
-
-{% block custom_foot_js %}
-    <script src="{% static 'js/plugins/datepicker/bootstrap-datepicker.js' %}"></script>
-    <script>
-        $(document).ready(function() {
-            $('#editable').DataTable({
-                "searching": false,
-                "paging": false,
-                "bInfo" : false,
-                "order": [],
-                "columnDefs": [{"targets": 6, "orderable": false}]
-            });
-            $('.select2').select2({
-                dropdownAutoWidth: true,
-                width: "auto"
-            });
-            $('.input-daterange.input-group').datepicker({
-                format: "yyyy-mm-dd",
-                todayBtn: "linked",
-                keyboardNavigation: false,
-                forceParse: false,
-                calendarWeeks: true,
-                autoclose: true
-            });
-        })
-    </script>
-{% endblock %}
-

apps/audits/templates/audits/login_log_list.html

@@ -1,148 +0,0 @@
-{% extends '_base_list.html' %}
-{% load i18n %}
-{% load static %}
-{% load common_tags %}
-{% block content_left_head %}
-    <link href="{% static 'css/plugins/datepicker/datepicker3.css' %}" rel="stylesheet">
-    <style>
-        #search_btn {
-            margin-bottom: 0;
-        }
-        .form-control {
-            height: 30px;
-        }
-        .select2-selection__rendered span.select2-selection, .select2-container .select2-selection--single {
-            height: 30px !important;
-        }
-    </style>
-{% endblock %}
-
-
-{% block table_search %}
-    <form id="search_form" method="get" action="" class="pull-right form-inline">
-        <div class="form-group" id="date">
-            <div class="input-daterange input-group" id="datepicker">
-                <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                <input type="text" id="id_date_from" class="input-sm form-control" style="width: 100px;" name="date_from" value="{{ date_from|date:'Y-m-d'}}">
-{#                <input type="text" class="input-sm form-control" style="width: 100px;" name="date_from" >#}
-                <span class="input-group-addon">to</span>
-                <input type="text" id="id_date_to" class="input-sm form-control" style="width: 100px;" name="date_to" value="{{ date_to|date:'Y-m-d'}}">
-            </div>
-        </div>
-        <div class="input-group">
-            <select class="select2 form-control" name="user">
-                <option value="">{% trans 'Select user' %}</option>
-                {% for u in user_list %}
-                    <option value="{{ u }}" {% if u == user %} selected {% endif %}>{{ u }}</option>
-                {% endfor %}
-            </select>
-        </div>
-        <div class="input-group">
-            <input type="text" id="search" class="form-control input-sm" name="keyword" placeholder="{% trans 'Search' %}" value="{{ keyword }}">
-        </div>
-        <div class="input-group">
-            <div class="input-group-btn">
-                <button id='search_btn' type="submit" class="btn btn-sm btn-primary">
-                    {% trans "Search" %}
-                </button>
-            </div>
-        </div>
-    </form>
-{% endblock %}
-{% block table_container %}
-<table class="table table-striped table-bordered table-hover " id="login_log_table" >
-    <thead>
-    	<tr>
-    		<th class="text-center">{% trans 'ID' %}</th>
-		    <th class="text-center">{% trans 'Username' %}</th>
-		    <th class="text-center">{% trans 'Type' %}</th>
-		    <th class="text-center">{% trans 'UA' %}</th>
-		    <th class="text-center">{% trans 'IP' %}</th>
-		    <th class="text-center">{% trans 'City' %}</th>
-		    <th class="text-center">{% trans 'MFA' %}</th>
-		    <th class="text-center">{% trans 'Reason' %}</th>
-		    <th class="text-center">{% trans 'Status' %}</th>
-		    <th class="text-center">{% trans 'Date' %}</th>
-    	</tr>
-    <thead>
-
-    <tbody>
-        {% for login_log in object_list %}
-	        <tr class="gradeX">
-	            <td class="text-center">{{ forloop.counter }}</td>
-	            <td class="text-center">{{ login_log.username }}</td>
-	            <td class="text-center">{{ login_log.get_type_display }}</td>
-	            <td class="text-center">
-	                <span href="javascript:void(0);" data-toggle="tooltips" title="{{ login_log.user_agent  }}">{{ login_log.user_agent | truncatechars:20 }}</span>
-	            </td>
-	            <td class="text-center">{{ login_log.ip }}</td>
-	            <td class="text-center">{{ login_log.city }}</td>
-	            <td class="text-center">{{ login_log.get_mfa_display }}</td>
-	            <td class="text-center">{{ login_log.reason_display }}</td>
-	            <td class="text-center">{{ login_log.get_status_display }}</td>
-	            <td class="text-center">{{ login_log.datetime }}</td>
-	        </tr>
-    	{% endfor %}
-    </tbody>
-</table>
-    <div id="actions" class="" style="margin-top: -20px">
-        <div class="input-group">
-            <select class="form-control m-b" style="width: auto" id="slct_bulk_update">
-                <option value="export">{% trans 'Export' %}</option>
-            </select>
-            <div class="input-group-btn pull-left" style="padding-left: 5px;">
-                <button id='btn_bulk_update' style="height: 32px;"  class="btn btn-sm btn-primary btn_export">
-                    {% trans 'Submit' %}
-                </button>
-            </div>
-        </div>
-    </div>
-
-{% endblock %}
-
-
-{% block custom_foot_js %}
-<script src="{% static 'js/plugins/datepicker/bootstrap-datepicker.js' %}"></script>
-<script>
-    $(document).ready(function() {
-        jumpserver.initStaticTable('#login_log_table');
-        $('#date .input-daterange').datepicker({
-            format: "yyyy-mm-dd",
-            todayBtn: "linked",
-            keyboardNavigation: false,
-            forceParse: false,
-            calendarWeeks: true,
-            autoclose: true
-
-        });
-        $('.select2').select2({
-            dropdownAutoWidth: true,
-            width: 'auto'
-        });
-    })
-    .on('click', '.btn_export', function () {
-        var date_from = $('#id_date_from').val();
-        var date_to = $('#id_date_to').val();
-        var user = $('.select2 option:selected').val();
-        var keyword = $('#search').val();
-        $.ajax({
-            url: "{% url "audits:login-log-export" %}",
-            method: 'POST',
-            data: JSON.stringify({
-                'date_from':date_from,
-                'date_to':date_to,
-                'user':user,
-                'keyword':keyword
-            }),
-            dataType: "json",
-            success: function (data, textStatus) {
-                window.open(data.redirect)
-            },
-            error: function () {
-                toastr.error('Export failed');
-            }
-        })
-    })
-</script>
-{% endblock %}
-

apps/audits/templates/audits/operate_log_list.html

@@ -1,123 +0,0 @@
-{% extends '_base_list.html' %}
-{% load i18n %}
-{% load static %}
-{% load terminal_tags %}
-{% load common_tags %}
-{% block custom_head_css_js %}
-    <link href="{% static 'css/plugins/datepicker/datepicker3.css' %}" rel="stylesheet">
-    <style>
-        #search_btn {
-            margin-bottom: 0;
-        }
-        .form-control {
-            height: 30px;
-        }
-        .select2-selection__rendered span.select2-selection, .select2-container .select2-selection--single {
-            height: 30px !important;
-        }
-    </style>
-{% endblock %}
-
-{% block content_left_head %}
-{% endblock %}
-
-
-{% block table_search %}
-    <form id="search_form" method="get" action="" class="pull-right form-inline">
-        <div class="form-group" id="date">
-            <div class="input-daterange input-group" id="datepicker">
-                <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                <input type="text" class="input-sm form-control" style="width: 100px;" name="date_from" value="{{ date_from|date:'Y-m-d' }}">
-                <span class="input-group-addon">to</span>
-                <input type="text" class="input-sm form-control" style="width: 100px;" name="date_to" value="{{ date_to|date:'Y-m-d' }}">
-            </div>
-        </div>
-        <div class="input-group">
-            <select class="select2 form-control" name="user">
-                <option value="">{% trans 'User' %}</option>
-                {% for u in user_list %}
-                    <option value="{{ u }}" {% if u == user %} selected {% endif %}>{{ u }}</option>
-                {% endfor %}
-            </select>
-        </div>
-        <div class="input-group">
-            <select class="select2 form-control" name="action">
-                <option value="">{% trans 'Action' %}</option>
-                {% for k, v in actions.items %}
-                    <option value="{{ k }}" {% if k == search_action %} selected {% endif %}>{{ v }}</option>
-                {% endfor %}
-            </select>
-        </div>
-        <div class="input-group">
-            <select class="select2 form-control" name="resource_type">
-                <option value="">{% trans 'Resource Type' %}</option>
-                {% for r in resource_type_list %}
-                    <option value="{{ r }}" {% if r == resource_type %} selected {% endif %}>{{ r }}</option>
-                {% endfor %}
-            </select>
-        </div>
-        <div class="input-group">
-            <div class="input-group-btn">
-                <button id='search_btn' type="submit" class="btn btn-sm btn-primary">
-                    {% trans 'Search' %}
-                </button>
-            </div>
-        </div>
-    </form>
-{% endblock %}
-
-{% block table_head %}
-    <th class="text-center">{% trans 'Handlers' %}</th>
-    <th class="text-center">{% trans 'Action' %}</th>
-    <th class="text-center">{% trans 'Resource Type' %}</th>
-    <th class="text-center">{% trans 'Resource' %}</th>
-    <th class="text-center">{% trans 'Remote addr' %}</th>
-    <th class="text-center">{% trans 'Datetime' %}</th>
-{% endblock %}
-
-{% block table_body %}
-    {% for object in object_list %}
-        <tr class="gradeX">
-{#            <td class="text-center">#}
-{#                <a href="{% url 'terminal:object-detail' pk=object.id %}">{{ forloop.counter }}</a>#}
-{#            </td>#}
-            <td class="text-center">{{ object.user }}</td>
-            <td class="text-center">{{ object.get_action_display }}</td>
-            <td class="text-center">{{ object.resource_type }}</td>
-            <td class="text-center">{{ object.resource }}</td>
-            <td class="text-center">{{ object.remote_addr }}</td>
-            <td class="text-center">{{ object.datetime }}</td>
-        </tr>
-    {% endfor %}
-{% endblock %}
-
-{% block content_bottom_left %}
-{% endblock %}
-
-{% block custom_foot_js %}
-    <script src="{% static 'js/plugins/datepicker/bootstrap-datepicker.js' %}"></script>
-    <script>
-        $(document).ready(function() {
-            $('#editable').DataTable({
-                "searching": false,
-                "paging": false,
-                "bInfo" : false,
-                "order": [],
-                "language": jumpserver.language
-            });
-            $('.select2').select2({
-                dropdownAutoWidth: true,
-                width: "auto"
-            });
-            $('.input-daterange.input-group').datepicker({
-                format: "yyyy-mm-dd",
-                todayBtn: "linked",
-                keyboardNavigation: false,
-                forceParse: false,
-                calendarWeeks: true,
-                autoclose: true
-            });
-        })
-    </script>
-{% endblock %}
-

apps/audits/templates/audits/password_change_log_list.html

@@ -1,100 +0,0 @@
-{% extends '_base_list.html' %}
-{% load i18n %}
-{% load static %}
-{% load terminal_tags %}
-{% load common_tags %}
-{% block custom_head_css_js %}
-    <link href="{% static 'css/plugins/datepicker/datepicker3.css' %}" rel="stylesheet">
-    <style>
-        #search_btn {
-            margin-bottom: 0;
-        }
-        .form-control {
-            height: 30px;
-        }
-        .select2-selection__rendered span.select2-selection, .select2-container .select2-selection--single {
-            height: 30px !important;
-        }
-    </style>
-{% endblock %}
-
-{% block content_left_head %}
-{% endblock %}
-
-
-{% block table_search %}
-    <form id="search_form" method="get" action="" class="pull-right form-inline">
-        <div class="form-group" id="date">
-            <div class="input-daterange input-group" id="datepicker">
-                <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                <input type="text" class="input-sm form-control" style="width: 100px;" name="date_from" value="{{ date_from|date:'Y-m-d' }}">
-                <span class="input-group-addon">to</span>
-                <input type="text" class="input-sm form-control" style="width: 100px;" name="date_to" value="{{ date_to|date:'Y-m-d' }}">
-            </div>
-        </div>
-        <div class="input-group">
-            <select class="select2 form-control" name="user">
-                <option value="">{% trans 'User' %}</option>
-                {% for u in user_list %}
-                    <option value="{{ u }}" {% if u == user %} selected {% endif %}>{{ u }}</option>
-                {% endfor %}
-            </select>
-        </div>
-        <div class="input-group">
-            <div class="input-group-btn">
-                <button id='search_btn' type="submit" class="btn btn-sm btn-primary">
-                    {% trans 'Search' %}
-                </button>
-            </div>
-        </div>
-    </form>
-{% endblock %}
-
-{% block table_head %}
-    <th class="text-center">{% trans 'User' %}</th>
-    <th class="text-center">{% trans 'Change by' %}</th>
-    <th class="text-center">{% trans 'Remote addr' %}</th>
-    <th class="text-center">{% trans 'Datetime' %}</th>
-{% endblock %}
-
-{% block table_body %}
-    {% for object in object_list %}
-        <tr class="gradeX">
-            <td class="text-center">{{ object.user }}</td>
-            <td class="text-center">{{ object.change_by }}</td>
-            <td class="text-center">{{ object.remote_addr }}</td>
-            <td class="text-center">{{ object.datetime }}</td>
-        </tr>
-    {% endfor %}
-{% endblock %}
-
-{% block content_bottom_left %}
-{% endblock %}
-
-{% block custom_foot_js %}
-    <script src="{% static 'js/plugins/datepicker/bootstrap-datepicker.js' %}"></script>
-    <script>
-        $(document).ready(function() {
-            $('#editable').DataTable({
-                "searching": false,
-                "paging": false,
-                "bInfo" : false,
-                "order": [],
-                "language": jumpserver.language
-            });
-            $('.select2').select2({
-                dropdownAutoWidth: true,
-                width: "auto"
-            });
-            $('.input-daterange.input-group').datepicker({
-                format: "yyyy-mm-dd",
-                todayBtn: "linked",
-                keyboardNavigation: false,
-                forceParse: false,
-                calendarWeeks: true,
-                autoclose: true
-            });
-        })
-    </script>
-{% endblock %}
-