github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-10-21 15:58:52 +00:00
Code Issues Projects Releases Wiki Activity

merge_dev

Browse Source
This commit is contained in:
liuzheng712
2015-11-17 09:53:43 +08:00
parent de9ce6dd19 2d27e3fee0
commit 036873e129
17 changed files with 31 additions and 1222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/juser/group_list.html
View File

@@ -129,4 +129,4 @@ type="checkbox" name="selected" value="{{ group.id }}">
$('.shiftCheckbox').shiftcheckbox();
});
</script>
{% endblock %}
{% endblock %}

4
templates/juser/user_add.html
View File

@@ -93,10 +93,10 @@
</div>
</div>
<div class="hr-line-dashed"></div>
<div class="form-group"><label class="col-sm-2 control-label">额外</label>
<div class="form-group"><label class="col-sm-2 control-label">其它</label>
<div class="col-sm-2">
<div class="checkbox i-checks">
<label><input type="checkbox" value="0" name="extra" >启用 </label>
<label><input type="checkbox" value="0" name="extra" >禁用 </label>
</div>
</div>
<div class="col-sm-2">

4
templates/juser/user_list.html
View File

@@ -42,7 +42,7 @@
<thead>
<tr>
<th class="text-center">
<input type="checkbox" id="select_all" onclick="selectAll()" name="select_all">
<input type="checkbox" id="check_all" onclick="checkAll()">
</th>
<th class="text-center">用户名</th>
<th class="text-center">姓名</th>
@@ -57,7 +57,7 @@
{% for user in users.object_list %}
<tr class="gradeX">
<td class="text-center">
<input type="checkbox" name="selected" value="{{ user.id }}">
<input type="checkbox" name="checked" value="{{ user.id }}">
</td>
<td class="text-center"> {{ user.username }} </td>
<td class="text-center"> {{ user.name }} </td>

8
templates/paginator.html
View File

@@ -47,13 +47,19 @@
var old_href = $(this).attr('href').replace('?', '');
var searchArray = searchStr.split('&');
if (searchStr == ''){
searchStr = '?page=1'
}
if (searchStr.indexOf('page')>=0){
searchArray.pop();
}
searchArray.push(old_href);
if (searchArray.length > 1){
if (searchArray.length > 1) {
$(this).attr('href', searchArray.join('&'));
}
{# sleep(1000)#}
})
});