github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-07-06 11:36:32 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3258 from jumpserver/dev_ak

Browse Source 
Dev ak
This commit is contained in:
BaiJiangJie 2019-09-23 20:13:06 +08:00 committed by GitHub
commit 9428c186b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/audits/templates/audits/ftp_log_list.html
View File

@ -112,7 +112,7 @@
<script src="{% static 'js/plugins/datepicker/bootstrap-datepicker.js' %}"></script> <script src="{% static 'js/plugins/datepicker/bootstrap-datepicker.js' %}"></script>
<script> <script>
$(document).ready(function() { $(document).ready(function() {
$('table').DataTable({ $('#editable').DataTable({
"searching": false, "searching": false,
"paging": false, "paging": false,
"bInfo" : false, "bInfo" : false,

2
apps/audits/templates/audits/login_log_list.html
View File

@ -105,7 +105,7 @@
<script src="{% static 'js/plugins/datepicker/bootstrap-datepicker.js' %}"></script> <script src="{% static 'js/plugins/datepicker/bootstrap-datepicker.js' %}"></script>
<script> <script>
$(document).ready(function() { $(document).ready(function() {
jumpserver.initStaticTable('table'); jumpserver.initStaticTable('#login_log_table');
$('#date .input-daterange').datepicker({ $('#date .input-daterange').datepicker({
format: "yyyy-mm-dd", format: "yyyy-mm-dd",
todayBtn: "linked", todayBtn: "linked",

2
apps/audits/templates/audits/operate_log_list.html
View File

@ -100,7 +100,7 @@
<script src="{% static 'js/plugins/datepicker/bootstrap-datepicker.js' %}"></script> <script src="{% static 'js/plugins/datepicker/bootstrap-datepicker.js' %}"></script>
<script> <script>
$(document).ready(function() { $(document).ready(function() {
$('table').DataTable({ $('#editable').DataTable({
"searching": false, "searching": false,
"paging": false, "paging": false,
"bInfo" : false, "bInfo" : false,

2
apps/audits/templates/audits/password_change_log_list.html
View File

@ -77,7 +77,7 @@
<script src="{% static 'js/plugins/datepicker/bootstrap-datepicker.js' %}"></script> <script src="{% static 'js/plugins/datepicker/bootstrap-datepicker.js' %}"></script>
<script> <script>
$(document).ready(function() { $(document).ready(function() {
$('table').DataTable({ $('#editable').DataTable({
"searching": false, "searching": false,
"paging": false, "paging": false,
"bInfo" : false, "bInfo" : false,

24
apps/authentication/templates/authentication/_access_key_modal.html
View File

@ -14,10 +14,13 @@
} }
</style> </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> {% 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> </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> <thead>
<tr> <tr>
<th class="text-center"> <th class="text-center">
@ -34,12 +37,8 @@
</tbody> </tbody>
</table> </table>
<div id="uc" hidden>
<button class="btn btn-primary btn-sm" id="create-btn" href="#"> {% trans "Create" %} </button>
</div>
<script> <script>
var table = null; var ak_table = null;
function initAccessKeyTable() { function initAccessKeyTable() {
var options = { var options = {
ele: $('#access_key_list_table'), ele: $('#access_key_list_table'),
@ -85,14 +84,13 @@ function initAccessKeyTable() {
{data: "date_created"}, {data: "date_created"},
{data: "id", orderable: false} {data: "id", orderable: false}
], ],
uc_html: $('#uc').html()
}; };
table = jumpserver.initServerSideDataTable(options); ak_table = jumpserver.initServerSideDataTable(options);
} }
$(document).ready(function () { $(document).ready(function () {
}).on("show.bs.modal", "#access_key_modal", function () { }).on("show.bs.modal", "#access_key_modal", function () {
if (!table) { if (!ak_table) {
initAccessKeyTable() initAccessKeyTable()
} }
}).on("click", "#create-btn", function () { }).on("click", "#create-btn", function () {
@ -101,7 +99,7 @@ $(document).ready(function () {
url: url, url: url,
method: 'POST', method: 'POST',
success: function () { success: function () {
table.ajax.reload(); ak_table.ajax.reload();
} }
}; };
requestApi(data) requestApi(data)
@ -120,7 +118,7 @@ $(document).ready(function () {
body: JSON.stringify({"is_active": true}), body: JSON.stringify({"is_active": true}),
method: "PATCH", method: "PATCH",
success: function () { success: function () {
table.ajax.reload(); ak_table.ajax.reload();
} }
}; };
requestApi(data) requestApi(data)
@ -132,7 +130,7 @@ $(document).ready(function () {
body: JSON.stringify({"is_active": false}), body: JSON.stringify({"is_active": false}),
method: "PATCH", method: "PATCH",
success: function () { success: function () {
table.ajax.reload(); ak_table.ajax.reload();
} }
}; };
requestApi(data) requestApi(data)