github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

update

pull/530/head
ibuler 2016-11-03 19:42:47 +08:00
parent 61eadf6891
commit f437d3f883
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/assets/templates/assets/asset_detail.html
View File

@ -60,7 +60,7 @@
<td><b>{{ asset.admin_user.name }}</b></td> <td><b>{{ asset.admin_user.name }}</b></td>
{% else %} {% else %}
<td><b>None</b></td> <td><b>None</b></td>
{% endbif %} {% endif %}
</tr> </tr>
<tr> <tr>
<td>{% trans 'Other IP' %}:</td> <td>{% trans 'Other IP' %}:</td>

5
apps/static/js/jumpserver.js
View File

@ -283,9 +283,10 @@ jumpserver.initDataTable = function (options) {
var ele = options.ele || $('.dataTable'); var ele = options.ele || $('.dataTable');
var columnDefs = [ var columnDefs = [
{ {
targets: 0, orderable: false, targets: 0,
orderable: false,
createdCell: function(td) { createdCell: function(td) {
$(td).html('<div class="checkbox checkbox-default"><input type="checkbox" class="ipt_check"><label></label></div>'); $(td).html('<input type="checkbox" class="ipt_check">');
} }
}, },
{className: 'text-center', targets: '_all'} {className: 'text-center', targets: '_all'}

3
apps/users/templates/users/user_list.html
View File

@ -21,7 +21,8 @@ div.dataTables_wrapper div.dataTables_filter {
<thead> <thead>
<tr> <tr>
<th class="text-center"> <th class="text-center">
<div class="checkbox checkbox-default"><input id="" type="checkbox" class="ipt_check_all"><label></label></div> {# <div><input id="" type="checkbox" class="ipt_check_all"><label></label></div>#}
<input id="" type="checkbox" class="ipt_check_all">
</th> </th>
<th class="text-center">{% trans 'Name' %}</th> <th class="text-center">{% trans 'Name' %}</th>
<th class="text-center">{% trans 'Username' %}</th> <th class="text-center">{% trans 'Username' %}</th>