diff --git a/apps/assets/templates/assets/asset_detail.html b/apps/assets/templates/assets/asset_detail.html index 29597c0a9..029166136 100644 --- a/apps/assets/templates/assets/asset_detail.html +++ b/apps/assets/templates/assets/asset_detail.html @@ -60,7 +60,7 @@ {{ asset.admin_user.name }} {% else %} None - {% endbif %} + {% endif %} {% trans 'Other IP' %}: diff --git a/apps/static/js/jumpserver.js b/apps/static/js/jumpserver.js index a467b74b5..e2bc67ba6 100644 --- a/apps/static/js/jumpserver.js +++ b/apps/static/js/jumpserver.js @@ -283,9 +283,10 @@ jumpserver.initDataTable = function (options) { var ele = options.ele || $('.dataTable'); var columnDefs = [ { - targets: 0, orderable: false, + targets: 0, + orderable: false, createdCell: function(td) { - $(td).html('
'); + $(td).html(''); } }, {className: 'text-center', targets: '_all'} diff --git a/apps/users/templates/users/user_list.html b/apps/users/templates/users/user_list.html index 85d2e206c..b50d5b24b 100644 --- a/apps/users/templates/users/user_list.html +++ b/apps/users/templates/users/user_list.html @@ -21,7 +21,8 @@ div.dataTables_wrapper div.dataTables_filter { -
+{#
#} + {% trans 'Name' %} {% trans 'Username' %}