From 0ed08c2f4cb9c49bbbbd5bfd075459aca05e5606 Mon Sep 17 00:00:00 2001
From: BaiJiangJie <bugatti_it@163.com>
Date: Mon, 23 Sep 2019 19:43:39 +0800
Subject: [PATCH 1/3] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=20API=20Key?=
 =?UTF-8?q?=20=E9=A1=B5=E9=9D=A2=E6=98=BE=E7=A4=BA=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../authentication/_access_key_modal.html         | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/apps/authentication/templates/authentication/_access_key_modal.html b/apps/authentication/templates/authentication/_access_key_modal.html
index 2d46ed727..b835a766e 100644
--- a/apps/authentication/templates/authentication/_access_key_modal.html
+++ b/apps/authentication/templates/authentication/_access_key_modal.html
@@ -14,10 +14,13 @@
     }
 
 </style>
-<div class="alert alert-info help-message">
+<div class="alert alert-info help-message" style="margin-left: 0px; margin-right: 0px;">
     {% trans 'Using api key sign api header, every requests header difference'%}, <a href="https://tools.ietf.org/html/draft-cavage-http-signatures-08">{% trans 'docs' %} </a>
 </div>
-<table class="table table-striped table-bordered table-hover " id="access_key_list_table" style="padding-top: 10px">
+<div class="uc pull-left m-r-0 m-t-10">
+    <button class="btn btn-primary btn-sm" id="create-btn" href="#"> {% trans "Create" %} </button>
+</div>
+<table class="table table-striped table-bordered table-hover " id="access_key_list_table">
     <thead>
     <tr>
         <th class="text-center">
@@ -34,9 +37,9 @@
     </tbody>
 </table>
 
-<div id="uc" hidden>
-    <button class="btn btn-primary btn-sm" id="create-btn" href="#"> {% trans "Create" %} </button>
-</div>
+{#<div id="uc" hidden>#}
+{#    <button class="btn btn-primary btn-sm" id="create-btn" href="#"> {% trans "Create" %} </button>#}
+{#</div>#}
 
 <script>
 var table = null;
@@ -85,7 +88,7 @@ function initAccessKeyTable() {
             {data: "date_created"},
             {data: "id", orderable: false}
         ],
-        uc_html: $('#uc').html()
+        {#uc_html: $('#uc').html()#}
     };
     table = jumpserver.initServerSideDataTable(options);
 }

From 7dc8b128d6542d41761f45ab4488388696db77b0 Mon Sep 17 00:00:00 2001
From: BaiJiangJie <bugatti_it@163.com>
Date: Mon, 23 Sep 2019 20:05:01 +0800
Subject: [PATCH 2/3] =?UTF-8?q?[Bugfix]=20=E4=BF=AE=E5=A4=8D=20API=20Key?=
 =?UTF-8?q?=20table=20=E5=8A=A0=E8=BD=BD=E6=97=B6=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?=EF=BC=88=E5=9C=A8=E6=97=A5=E5=BF=97=E5=AE=A1=E8=AE=A1=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E4=B8=AD=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/audits/templates/audits/ftp_log_list.html             | 2 +-
 apps/audits/templates/audits/login_log_list.html           | 2 +-
 apps/audits/templates/audits/operate_log_list.html         | 2 +-
 apps/audits/templates/audits/password_change_log_list.html | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/audits/templates/audits/ftp_log_list.html b/apps/audits/templates/audits/ftp_log_list.html
index a5e3fceec..9e92f8481 100644
--- a/apps/audits/templates/audits/ftp_log_list.html
+++ b/apps/audits/templates/audits/ftp_log_list.html
@@ -112,7 +112,7 @@
     <script src="{% static 'js/plugins/datepicker/bootstrap-datepicker.js' %}"></script>
     <script>
         $(document).ready(function() {
-            $('table').DataTable({
+            $('#editable').DataTable({
                 "searching": false,
                 "paging": false,
                 "bInfo" : false,
diff --git a/apps/audits/templates/audits/login_log_list.html b/apps/audits/templates/audits/login_log_list.html
index 6a3bae989..e67b792b0 100644
--- a/apps/audits/templates/audits/login_log_list.html
+++ b/apps/audits/templates/audits/login_log_list.html
@@ -105,7 +105,7 @@
     <script src="{% static 'js/plugins/datepicker/bootstrap-datepicker.js' %}"></script>
     <script>
         $(document).ready(function() {
-            jumpserver.initStaticTable('table');
+            jumpserver.initStaticTable('#login_log_table');
             $('#date .input-daterange').datepicker({
                 format: "yyyy-mm-dd",
                 todayBtn: "linked",
diff --git a/apps/audits/templates/audits/operate_log_list.html b/apps/audits/templates/audits/operate_log_list.html
index ae072187d..31e219a85 100644
--- a/apps/audits/templates/audits/operate_log_list.html
+++ b/apps/audits/templates/audits/operate_log_list.html
@@ -100,7 +100,7 @@
     <script src="{% static 'js/plugins/datepicker/bootstrap-datepicker.js' %}"></script>
     <script>
         $(document).ready(function() {
-            $('table').DataTable({
+            $('#editable').DataTable({
                 "searching": false,
                 "paging": false,
                 "bInfo" : false,
diff --git a/apps/audits/templates/audits/password_change_log_list.html b/apps/audits/templates/audits/password_change_log_list.html
index 1440dca2d..d079d0797 100644
--- a/apps/audits/templates/audits/password_change_log_list.html
+++ b/apps/audits/templates/audits/password_change_log_list.html
@@ -77,7 +77,7 @@
     <script src="{% static 'js/plugins/datepicker/bootstrap-datepicker.js' %}"></script>
     <script>
         $(document).ready(function() {
-            $('table').DataTable({
+            $('#editable').DataTable({
                 "searching": false,
                 "paging": false,
                 "bInfo" : false,

From 6db57424aa94a28ddfda4eed0a17481aff93040b Mon Sep 17 00:00:00 2001
From: BaiJiangJie <bugatti_it@163.com>
Date: Mon, 23 Sep 2019 20:11:48 +0800
Subject: [PATCH 3/3] =?UTF-8?q?[Bugfix]=20=E4=BF=AE=E6=94=B9=20API=20key?=
 =?UTF-8?q?=20table=20=E7=9A=84=E5=89=8D=E7=AB=AF=E5=8F=98=E9=87=8F?=
 =?UTF-8?q?=E5=90=8D=20ak=5Ftable?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../authentication/_access_key_modal.html       | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/apps/authentication/templates/authentication/_access_key_modal.html b/apps/authentication/templates/authentication/_access_key_modal.html
index b835a766e..b779e9b94 100644
--- a/apps/authentication/templates/authentication/_access_key_modal.html
+++ b/apps/authentication/templates/authentication/_access_key_modal.html
@@ -37,12 +37,8 @@
     </tbody>
 </table>
 
-{#<div id="uc" hidden>#}
-{#    <button class="btn btn-primary btn-sm" id="create-btn" href="#"> {% trans "Create" %} </button>#}
-{#</div>#}
-
 <script>
-var table = null;
+var ak_table = null;
 function initAccessKeyTable() {
     var options = {
         ele: $('#access_key_list_table'),
@@ -88,14 +84,13 @@ function initAccessKeyTable() {
             {data: "date_created"},
             {data: "id", orderable: false}
         ],
-        {#uc_html: $('#uc').html()#}
     };
-    table = jumpserver.initServerSideDataTable(options);
+    ak_table = jumpserver.initServerSideDataTable(options);
 }
 
 $(document).ready(function () {
 }).on("show.bs.modal", "#access_key_modal", function () {
-    if (!table) {
+    if (!ak_table) {
         initAccessKeyTable()
     }
 }).on("click", "#create-btn", function () {
@@ -104,7 +99,7 @@ $(document).ready(function () {
         url: url,
         method: 'POST',
         success: function () {
-            table.ajax.reload();
+            ak_table.ajax.reload();
         }
     };
     requestApi(data)
@@ -123,7 +118,7 @@ $(document).ready(function () {
         body: JSON.stringify({"is_active": true}),
         method: "PATCH",
         success: function () {
-            table.ajax.reload();
+            ak_table.ajax.reload();
         }
     };
     requestApi(data)
@@ -135,7 +130,7 @@ $(document).ready(function () {
         body: JSON.stringify({"is_active": false}),
         method: "PATCH",
         success: function () {
-            table.ajax.reload();
+            ak_table.ajax.reload();
         }
     };
     requestApi(data)