From 1d29c52a435c6cbc0bac2bf6141326e7952ce028 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Fri, 4 Nov 2016 19:25:10 +0800
Subject: [PATCH] Update datatable

---
 .../templates/audits/proxy_log_list.html      | 154 ++++++-----------
 apps/audits/views.py                          |   4 +-
 .../perms/asset_permission_list.html          | 163 ++++++------------
 3 files changed, 106 insertions(+), 215 deletions(-)

diff --git a/apps/audits/templates/audits/proxy_log_list.html b/apps/audits/templates/audits/proxy_log_list.html
index e28cc3cd7..e79f5e514 100644
--- a/apps/audits/templates/audits/proxy_log_list.html
+++ b/apps/audits/templates/audits/proxy_log_list.html
@@ -1,108 +1,58 @@
 {% extends '_base_list.html' %}
-{% load i18n static %}
-{% block custom_head_css_js %}
-    {{ block.super }}
-    <link href="{% static "css/plugins/footable/footable.core.css" %}" rel="stylesheet">
-    <link href="{% static "css/plugins/layer/layer.css" %}" rel="stylesheet">
-    <style>
-        div.dataTables_wrapper div.dataTables_filter,
-        .dataTables_length {
-            float: right !important;
-        }
+{% load i18n %}
+{% load common_tags %}
 
-        div.dataTables_wrapper div.dataTables_filter {
-            margin-left: 15px;
-        }
-</style>
+{% block table_head %}
+    <th class="text-center">{% trans 'ID' %}</th>
+    <th class="text-center">{% trans 'Username' %}</th>
+    <th class="text-center">{% trans 'IP' %}</th>
+    <th class="text-center">{% trans 'System user' %}</th>
+    <th class="text-center">{% trans 'Command' %}</th>
+    <th class="text-center">{% trans 'Success' %}</th>
+    <th class="text-center">{% trans 'Finished' %}</th>
+    <th class="text-center">{% trans 'Date start' %}</th>
+    <th class="text-center">{% trans 'Time' %}</th>
 {% endblock %}
-{% block table_search %}{% endblock %}
-{% block table_container %}
-{#<div class="uc pull-left m-l-5 m-r-5"><a href="{% url "users:user-create" %}" class="btn btn-sm btn-primary"> {% trans "Create user" %} </a></div>#}
-    <table class="table table-striped table-bordered table-hover " id="proxy_log_list_table" >
-        <thead>
-            <tr>
-                <th class="text-center">
-                    <div class="checkbox checkbox-default">
-                        <input type="checkbox" class="ipt_check_all">
-                    </div>
-                </th>
-                <th class="text-center">{% trans 'Username' %}</th>
-                <th class="text-center">{% trans 'IP' %}</th>
-                <th class="text-center">{% trans 'System user' %}</th>
-    {#            <th class="text-center">{% trans 'Login type' %}</th>#}
-                <th class="text-center">{% trans 'Command' %}</th>
-                <th class="text-center">{% trans 'Success' %}</th>
-                <th class="text-center">{% trans 'Finished' %}</th>
-                <th class="text-center">{% trans 'Date start' %}</th>
-                <th class="text-center">{% trans 'Time' %}</th>
-                <th class="text-center">{% trans 'Action' %}</th>
-            </tr>
-        </thead>
-        <tbody>
-        </tbody>
-    </table>
+
+{% block table_body %}
+     {% for proxy_log in proxy_log_list %}
+         <tr class="gradeX">
+             <td class="text-center">
+                 <a href="{% url 'audits:proxy-log-detail' pk=proxy_log.id %}">{{ proxy_log.id }}</a>
+             </td>
+             <td class="text-center">{{ proxy_log.username }}</td>
+             <td class="text-center">{{ proxy_log.ip }}</td>
+             <td class="text-center">{{ proxy_log.system_user.name }}</td>
+             <td class="text-center">{{ proxy_log.command.count }}</td>
+             <td class="text-center">
+             {% if proxy_log.was_failed %}
+                 <i class="fa fa-times text-danger"></i>
+             {% else %}
+                 <i class="fa fa-check text-navy"></i>
+             {% endif %}
+             </td>
+             <td class="text-center">
+             {% if proxy_log.is_finished %}
+                 <i class="fa fa-times text-danger"></i>
+             {% else %}
+                 <i class="fa fa-check text-navy"></i>
+             {% endif %}
+             </td>
+             <td class="text-center">{{ proxy_log.date_start }}</td>
+             <td class="text-center">{{ proxy_log.date_finished }}</td>
+         </tr>
+     {% endfor %}
 {% endblock %}
+
 {% block custom_foot_js %}
-<script src="{% static 'js/jquery.form.min.js' %}"></script>
-<script src="{% static "js/plugins/layer/layer.js" %}"></script>
-<script>
-$(document).ready(function(){
-    var options = {
-        ele: $('#proxy_log_list_table'),
-        columnDefs: [
-            {targets: 1, createdCell: function (td, cellData, rowData) {
-                var detail_btn = '<a href="{% url "users:user-detail" pk=99991937 %}">' + cellData + '</a>';
-                $(td).html(detail_btn.replace('99991937', rowData.id));
-             }},
-            {targets: 4, createdCell: function (td, cellData, rowData) {
-                if (cellData) {
-                    $(td).html('<a url="{% url "audits:proxy-log-commands-list" pk=99991938 %}" class="commands">99991937</a>'
-                            .replace('99991937', cellData)
-                            .replace('99991938',rowData.id))
-                }
-            }},
-            {targets: 5, createdCell: function (td, cellData) {
-                if (cellData) {
-                    $(td).html('<i class="fa fa-times text-danger"></i>')
-                } else {
-                    $(td).html('<i class="fa fa-check text-navy"></i>')
-                }
-             }},
-            {targets: 6, createdCell: function (td, cellData) {
-                if (!cellData) {
-                    $(td).html('<i class="fa fa-times text-danger"></i>')
-                } else {
-                    $(td).html('<i class="fa fa-check text-navy"></i>')
-                }
-             }},
-            {targets: 9, createdCell: function (td, cellData, rowData) {
-                var detail_btn = '<a href="{% url "audits:proxy-log-detail" pk=99991937 %}" class="btn btn-xs btn-info">{% trans "Detail" %}</a>'
-                        .replace('99991937', cellData);
-                var delete_btn = '<a class="btn btn-xs btn-danger m-l-xs btn_delete" data-uid="99991937" data-name="99991938">{% trans "Delete" %}</a>'
-                        .replace('99991937', cellData)
-                        .replace('99991938', rowData.name);
-                $(td).html(detail_btn + delete_btn)
-            }}
-        ],
-        ajax_url: '{% url "audits:proxy-log-list-create-api" %}',
-        columns: [{data: function(){return ""}}, {data: "name" }, {data: "ip"},
-                  {data: "system_user"}, {data: "command_length"}, {data: 'was_failed'},
-                  {data: "is_finished"}, {data: "date_start"}, {data: 'time'}, {data: 'id'}],
-        op_html: $('#actions').html()
-    };
-    jumpserver.initDataTable(options);
-}).on('click', '.commands', function () {
-    var url = $(this).attr('url');
-    layer.open({
-         type: 2,
-         title: '很多时候，我们想最大化看，比如像这个页面。',
-         shadeClose: true,
-         shade: false,
-         maxmin: true, //开启最大化最小化按钮
-         area: ['893px', '600px'],
-         content: url
-        });
-    })
-
-</script>
+    <script>
+        $(document).ready(function() {
+            $('table').DataTable({
+                "searching": false,
+                "paging": false,
+                "order": []
+            })
+        })
+    </script>
 {% endblock %}
+
diff --git a/apps/audits/views.py b/apps/audits/views.py
index 151c93967..bd1c9bf74 100644
--- a/apps/audits/views.py
+++ b/apps/audits/views.py
@@ -11,8 +11,10 @@ from .models import ProxyLog, CommandLog
 from .utils import AdminUserRequiredMixin
 
 
-class ProxyLogListView(TemplateView):
+class ProxyLogListView(ListView):
+    model = ProxyLog
     template_name = 'audits/proxy_log_list.html'
+    context_object_name = 'proxy_log_list'
 
     def get_context_data(self, **kwargs):
         context = super(ProxyLogListView, self).get_context_data(**kwargs)
diff --git a/apps/perms/templates/perms/asset_permission_list.html b/apps/perms/templates/perms/asset_permission_list.html
index 1c1b167c3..d7b06f1c2 100644
--- a/apps/perms/templates/perms/asset_permission_list.html
+++ b/apps/perms/templates/perms/asset_permission_list.html
@@ -1,120 +1,59 @@
 {% extends '_base_list.html' %}
 {% load i18n %}
-{% load static %}
 {% load common_tags %}
-{% block custom_head_css_js %}
-    {{ block.super }}
-    <style>
-        div.dataTables_wrapper div.dataTables_filter,
-        .dataTables_length {
-            float: right !important;
-        }
-
-        div.dataTables_wrapper div.dataTables_filter {
-            margin-left: 15px;
-        }
-</style>
+{% block content_left_head %}
+    <a href="{% url 'perms:asset-permission-create' %}" class="btn btn-sm btn-primary "> {% trans "Create permission" %} </a>
 {% endblock %}
-{% block table_search %}{% endblock %}
-{% block table_container %}
-    <div class="uc pull-left m-l-5 m-r-5">
-        <a href="{% url 'perms:asset-permission-create' %}" class="btn btn-sm btn-primary "> {% trans "Create permission" %} </a>
-    </div>
-    <table class="table table-striped table-bordered table-hover " id="asset-permission-list-table" >
-        <thead>
-            <tr>
-                <th class="text-center">
-                    <div class="checkbox checkbox-default">
-                        <input type="checkbox" class="ipt_check_all">
-                    </div>
-                </th>
-                <th class="text-center">{% trans 'Name' %}</th>
-                <th class="text-center">{% trans 'User' %}</th>
-                <th class="text-center">{% trans 'User group' %}</th>
-                <th class="text-center">{% trans 'Asset' %}</th>
-                <th class="text-center">{% trans 'Asset group' %}</th>
-                <th class="text-center">{% trans 'System user' %}</th>
-                <th class="text-center"><a href="{% url 'users:user-list' %}?sort=date_expired">{% trans 'Is valid' %}</a></th>
-                <th class="text-center">{% trans 'Action' %}</th>
-            </tr>
-        </thead>
-    </table>
+
+{% block table_head %}
+    <th class="text-center">{% trans 'ID' %}</th>
+    <th class="text-center">{% trans 'Name' %}</th>
+    <th class="text-center">{% trans 'User' %}</th>
+    <th class="text-center">{% trans 'User group' %}</th>
+    <th class="text-center">{% trans 'Asset' %}</th>
+    <th class="text-center">{% trans 'Asset group' %}</th>
+    <th class="text-center">{% trans 'System user' %}</th>
+    <th class="text-center">{% trans 'Is valid' %}</th>
+    <th class="text-center">{% trans 'Action' %}</th>
+{% endblock %}
+
+{% block table_body %}
+     {% for asset_permission in asset_permission_list %}
+         <tr class="gradeX">
+             <td class="text-center">{{ asset_permission.id }}</td>
+             <td class="text-center">
+                 <a href="{% url 'perms:asset-permission-detail' pk=asset_permission.id %}">
+                     {{ asset_permission.name }}
+                 </a>
+             </td>
+             <td class="text-center">{{ asset_permission.users.count }}</td>
+             <td class="text-center">{{ asset_permission.user_groups.count }}</td>
+             <td class="text-center">{{ asset_permission.assets.count }}</td>
+             <td class="text-center">{{ asset_permission.asset_groups.count }}</td>
+             <td class="text-center">{{ asset_permission.system_users.count }}</td>
+             <td class="text-center">
+             {% if asset_permission.is_valid %}
+                 <i class="fa fa-check text-navy"></i>
+             {% else %}
+                 <i class="fa fa-times text-danger"></i>
+             {% endif %}
+             </td>
+             <td class="text-center">
+                 <a href="{% url 'perms:asset-permission-update' pk=asset_permission.id %}" class="btn btn-xs btn-info">{% trans 'Update' %}</a>
+                 <a href="{% url 'perms:asset-permission-delete' pk=asset_permission.id %}" class="btn btn-xs btn-danger del">{% trans 'Delete' %}</a>
+             </td>
+         </tr>
+     {% endfor %}
 {% endblock %}
 
 {% block custom_foot_js %}
-<script>
-
-function assetPermissionTableDraw(url) {
-    var options = {
-        ele: $('#asset-permission-list-table'),
-        buttons: [],
-        columnDefs: [
-            {targets: 1, createdCell: function (td, cellData, rowData) {
-                var detail_btn = '<a href="{% url "perms:asset-permission-detail" pk=99991937 %}">' + cellData + '</a>';
-                $(td).html(detail_btn.replace('99991937', rowData.id));
-             }},
-            {targets: 2, createdCell: function (td, cellData) {
-                if (cellData) {
-                    $(td).html(cellData.length)
-                }
-            }},
-            {targets: 3, createdCell: function (td, cellData) {
-                if (cellData) {
-                    $(td).html(cellData.length)
-                }
-            }},
-            {targets: 4, createdCell: function (td, cellData) {
-                if (cellData) {
-                    $(td).html(cellData.length)
-                }
-            }},
-            {targets: 5, createdCell: function (td, cellData) {
-                if (cellData) {
-                    $(td).html(cellData.length)
-                }
-            }},
-            {targets: 6, createdCell: function (td, cellData) {
-                if (cellData) {
-                    $(td).html(cellData.length)
-                }
-            }},
-            {targets: 7, createdCell: function (td, cellData) {
-                if (!cellData) {
-                    $(td).html('<i class="fa fa-times text-danger"></i>')
-                } else {
-                    $(td).html('<i class="fa fa-check text-navy"></i>')
-                }
-             }},
-            {targets: 8, createdCell: function (td, cellData, rowData) {
-                var detail_btn = '<a href="{% url "audits:proxy-log-detail" pk=99991937 %}" class="btn btn-xs btn-info">{% trans "Detail" %}</a>'
-                        .replace('99991937', cellData);
-                var delete_btn = '<a class="btn btn-xs btn-danger m-l-xs btn_delete" data-uid="99991937" data-name="99991938">{% trans "Delete" %}</a>'
-                        .replace('99991937', cellData)
-                        .replace('99991938', rowData.name);
-                $(td).html(detail_btn + delete_btn)
-            }}
-        ],
-        ajax_url: url,
-        columns: [{data: function(){return ""}}, {data: "name" }, {data: "users"},
-                  {data: "user_groups"}, {data: "assets"}, {data: 'asset_groups'},
-                  {data: "system_users"}, {data: "is_active"}, {data: 'id'}],
-        op_html: $('#actions').html()
-    };
-    jumpserver.initDataTable(options);
-
-}
-
-function searchAssetPermission() {
-    var value = $('.dataTables_filter input').val();
-    assetPermissionTableDraw()
-}
-
-$(document).ready(function(){
-    assetPermissionTableDraw('{% url "perms:asset-permission-list-create-api" %}');
-}).on('keyup', '.dataTables_filter input', function () {
-    searchAssetPermission()
-})
-</script>
+    <script>
+        $(document).ready(function() {
+            $('table').DataTable({
+                "searching": false,
+                "paging": false,
+                "order": []
+            })
+        })
+    </script>
 {% endblock %}
-
-