From 3bfe0e3c16b392d4a64230f99fec7eadf1461c10 Mon Sep 17 00:00:00 2001
From: halcyon <864072399@qq.com>
Date: Tue, 14 Apr 2015 17:25:56 +0800
Subject: [PATCH] bugs
---
jasset/urls.py | 2 +-
jasset/views.py | 105 ++++++++++++++++---------
jperm/views.py | 2 +-
jumpserver.conf | 8 +-
templates/error.html | 18 ++++-
templates/index.html | 2 +-
templates/jasset/group_add.html | 20 ++++-
templates/jasset/group_detail.html | 30 ++-----
templates/jasset/group_list.html | 20 +++++
templates/jasset/host_add_multi.html | 5 +-
templates/jasset/host_list_common.html | 2 +-
templates/jasset/idc_detail.html | 61 +++-----------
templates/jasset/idc_list.html | 22 +++++-
13 files changed, 169 insertions(+), 128 deletions(-)
diff --git a/jasset/urls.py b/jasset/urls.py
index 1e66eb59..d0e7e3f8 100644
--- a/jasset/urls.py
+++ b/jasset/urls.py
@@ -18,7 +18,7 @@ urlpatterns = patterns('',
url(r'^group_edit/$', group_edit),
url(r'^group_list/$', group_list),
url(r'^group_detail/$', group_detail),
- url(r'^group_del_host/(\w+)/$', group_del_host),
+ url(r'^group_del_host/$', group_del_host),
url(r'^group_del/$', group_del),
url(r'^host_del/(\w+)/$', host_del),
url(r'^host_edit/$', view_splitter, {'su': host_edit, 'adm': host_edit_adm}),
diff --git a/jasset/views.py b/jasset/views.py
index c37c2291..f41c3b93 100644
--- a/jasset/views.py
+++ b/jasset/views.py
@@ -184,31 +184,54 @@ def host_add(request):
def host_add_batch(request):
header_title, path1, path2 = u'批é‡æ·»åŠ 主机', u'资产管ç†', u'批é‡æ·»åŠ 主机'
login_types = {'LDAP': 'L', 'MAP': 'M'}
+ active_types = {'激活': 1, 'ç¦ç”¨': 0}
dept_id = get_user_dept(request)
if request.method == 'POST':
multi_hosts = request.POST.get('j_multi').split('\n')
+ print multi_hosts
for host in multi_hosts:
if host == '':
break
j_ip, j_port, j_type, j_idc, j_groups, j_depts, j_active, j_comment = host.split()
j_type = login_types[j_type]
+ j_active = active_types[str(j_active)]
j_group = ast.literal_eval(j_groups)
j_dept = ast.literal_eval(j_depts)
+ idc = IDC.objects.filter(name=j_idc)
+ if idc:
+ j_idc = idc[0].id
+
+ group_ids, dept_ids = [], []
+ for group_name in j_group:
+ group = BisGroup.objects.filter(name=group_name)
+ if group:
+ group_id = group[0].id
+ group_ids.append(group_id)
+
+ for dept_name in j_dept:
+ dept = DEPT.objects.filter(name=dept_name)
+ if dept:
+ dept_id = dept[0].id
+ dept_ids.append(dept_id)
+
+ if is_group_admin(request) and not verify(request, asset_group=group_ids, edept=dept_ids):
+ return httperror(request, 'æ·»åŠ å¤±è´¥, æ‚¨æ— æƒæ·»åŠ !')
+
if Asset.objects.filter(ip=str(j_ip)):
emg = u'该IP %s å·²å˜åœ¨!' % j_ip
return render_to_response('jasset/host_add_multi.html', locals(),
context_instance=RequestContext(request))
- if j_type == 'M':
- j_user = request.POST.get('j_user')
- j_password = cryptor.encrypt(request.POST.get('j_password'))
- db_host_insert(j_ip, j_port, j_idc, j_type, j_group, j_dept, j_active, j_comment, j_user, j_password)
- else:
- db_host_insert(j_ip, j_port, j_idc, j_type, j_group, j_dept, j_active, j_comment)
+ # if j_type == 'M':
+ # j_user = request.POST.get('j_user')
+ # j_password = request.POST.get('j_password')
+ # db_host_insert(j_ip, j_port, j_idc, j_type, group_ids, dept_ids, j_active, j_comment)
+ # else:
+ db_host_insert(j_ip, j_port, j_idc, j_type, group_ids, dept_ids, j_active, j_comment)
smg = u'批é‡æ·»åŠ æ·»åŠ æˆåŠŸ'
- return HttpResponseRedirect('/jasset/host_list/')
+ return render_to_response('jasset/host_add_multi.html', locals(), context_instance=RequestContext(request))
return render_to_response('jasset/host_add_multi.html', locals(), context_instance=RequestContext(request))
@@ -450,7 +473,7 @@ def host_detail(request):
return httperror(request, 'æ‚¨æ— æƒæŸ¥çœ‹!')
elif is_common_user(request):
- username = get_session_user_info[1]
+ username = get_session_user_info(request)[1]
user_permed_hosts = user_perm_asset_api(username)
if post not in user_permed_hosts:
return httperror(request, 'æ‚¨æ— æƒæŸ¥çœ‹!')
@@ -576,7 +599,7 @@ def group_add(request):
dept_id = get_user_dept(request)
dept = DEPT.objects.get(id=dept_id)
posts = Asset.objects.filter(dept=dept)
- edept = DEPT.objects.get(id=dept_id)
+ edept = get_session_user_info(request)[5]
if request.method == 'POST':
j_group = request.POST.get('j_group', '')
@@ -652,15 +675,17 @@ def group_edit(request):
header_title, path1, path2 = u'编辑主机组', u'资产管ç†', u'编辑主机组'
group_id = request.GET.get('id', '')
group = BisGroup.objects.get(id=group_id)
- all = Asset.objects.all()
+ host_all = Asset.objects.all()
dept_id = get_user_dept(request)
- eposts = Asset.objects.filter(bis_group=group).order_by('ip')
+ eposts = Asset.objects.filter(bis_group=group)
if is_super_user(request):
edept = DEPT.objects.all()
- posts = [g for g in all if g not in eposts]
+ posts = [g for g in host_all if g not in eposts]
elif is_group_admin(request):
+ if not verify(request, asset_group=[group_id]):
+ return httperror(request, '编辑失败, æ‚¨æ— æƒæ“作!')
dept = DEPT.objects.get(id=dept_id)
all_dept = Asset.objects.filter(dept=dept)
posts = [g for g in all_dept if g not in eposts]
@@ -688,42 +713,44 @@ def group_edit(request):
@require_admin
def group_detail(request):
header_title, path1, path2 = u'主机组详情', u'资产管ç†', u'主机组详情'
- login_types = {'L': 'LDAP', 'S': 'SSH_KEY', 'P': 'PASSWORD', 'M': 'MAP'}
- dept_id = get_user_dept(request)
- dept = DEPT.objects.get(id=dept_id)
- group_id = request.GET.get('id')
- group_name = BisGroup.objects.get(id=group_id).name
- b = BisGroup.objects.get(id=group_id)
+ login_types = {'L': 'LDAP', 'M': 'MAP'}
+ dept = get_session_user_info(request)[5]
+ group_id = request.GET.get('id', '')
+ group = BisGroup.objects.get(id=group_id)
if is_super_user(request):
- posts = Asset.objects.filter(bis_group=b).order_by('ip')
- contact_list, p, contacts, page_range, current_page, show_first, show_end = pages(posts, request)
+ posts = Asset.objects.filter(bis_group=group).order_by('ip')
elif is_group_admin(request):
- posts = Asset.objects.filter(bis_group=b).filter(dept=dept).order_by('ip')
- contact_list, p, contacts, page_range, current_page, show_first, show_end = pages(posts, request)
+ if not verify(request, asset_group=[group_id]):
+ return httperror(request, 'æ‚¨æ— æƒæŸ¥çœ‹!')
+ posts = Asset.objects.filter(bis_group=group).filter(dept=dept).order_by('ip')
+
+ contact_list, p, contacts, page_range, current_page, show_first, show_end = pages(posts, request)
return render_to_response('jasset/group_detail.html', locals(), context_instance=RequestContext(request))
@require_admin
-def group_del_host(request, offset):
+def group_del_host(request):
if request.method == 'POST':
- group_name = request.POST.get('group_name')
+ group_id = request.POST.get('group_id')
+ offset = request.GET.get('id', '')
+ group = BisGroup.objects.get(id=group_id)
if offset == 'group':
- group = BisGroup.objects.get(name=group_name)
- elif offset == 'idc':
- group = IDC.objects.get(name=group_name)
- len_list = request.POST.get("len_list")
- for i in range(int(len_list)):
- key = "id_list[" + str(i) + "]"
- jid = request.POST.get(key)
- g = Asset.objects.get(id=jid)
- if offset == 'group':
+ len_list = request.POST.get("len_list")
+ for i in range(int(len_list)):
+ key = "id_list[" + str(i) + "]"
+ jid = request.POST.get(key)
+ g = Asset.objects.get(id=jid)
group.asset_set.remove(g)
- elif offset == 'idc':
- Asset.objects.filter(id=jid).delete()
- BisGroup.objects.filter(name=g.ip).delete()
- return HttpResponseRedirect('/jasset/%s_detail/?id=%s' % (offset, group.id))
+ else:
+ offset = request.GET.get('id', '')
+ group_id = request.GET.get('gid', '')
+ group = BisGroup.objects.get(id=group_id)
+ g = Asset.objects.get(id=offset)
+ group.asset_set.remove(g)
+
+ return HttpResponseRedirect('/jasset/group_detail/?id=%s' % group.id)
@require_admin
@@ -734,9 +761,13 @@ def group_del(request):
for i in range(int(len_list)):
key = "id_list[" + str(i) + "]"
gid = request.POST.get(key)
+ if not verify(request, asset_group=[gid]):
+ return httperror(request, 'åˆ é™¤å¤±è´¥, æ‚¨æ— æƒåˆ 除!')
BisGroup.objects.filter(id=gid).delete()
else:
gid = int(offset)
+ if not verify(request, asset_group=[gid]):
+ return httperror(request, 'åˆ é™¤å¤±è´¥, æ‚¨æ— æƒåˆ 除!')
BisGroup.objects.filter(id=gid).delete()
return HttpResponseRedirect('/jasset/group_list/')
diff --git a/jperm/views.py b/jperm/views.py
index 52e394ff..40ad7eda 100644
--- a/jperm/views.py
+++ b/jperm/views.py
@@ -722,7 +722,7 @@ def get_apply_posts(request, status, username, dept_name, keyword=None):
posts = Apply.objects.filter(Q(applyer__contains=keyword) | Q(approver__contains=keyword)) \
.filter(status=status).filter(dept=dept_name).order_by('-date_add')
else:
- posts = Log.objects.filter(status=status).filter(dept=dept_name).order_by('-date_add')
+ posts = Apply.objects.filter(status=status).filter(dept=dept_name).order_by('-date_add')
elif is_common_user(request):
if keyword:
diff --git a/jumpserver.conf b/jumpserver.conf
index 3c56daab..f49a1a54 100644
--- a/jumpserver.conf
+++ b/jumpserver.conf
@@ -15,14 +15,14 @@ database = jumpserver
[ldap]
ldap_enable = 1
-host_url = ldap://192.168.8.230:389
-base_dn = dc=jumpserver, dc=org
-root_dn = cn=admin,dc=jumpserver,dc=org
+host_url = ldap://192.168.8.220:389
+base_dn = dc=fun, dc=tv
+root_dn = cn=admin,dc=fun,dc=tv
root_pw = secret234
[websocket]
-web_socket_host = 192.168.173.129:3000
+web_socket_host = 192.168.8.220:3000
[web]
diff --git a/templates/error.html b/templates/error.html
index 99356315..43f72bf7 100644
--- a/templates/error.html
+++ b/templates/error.html
@@ -21,8 +21,8 @@
<div class="middle-box text-center animated fadeInDown">
<h1>Error</h1>
- <h3 class="font-bold">{{ message }}</h3>
-
+ <h3 class="font-bold text-danger">{{ message }}</h3>
+ <h3 id="jumpTo" class="font-bold text-info"></h3>
<div class="error-desc">
The server encountered something unexpected that didn't allow it to complete the request. We apologize.<br/>
You can go back to main page: <br/><a href="/" class="btn btn-primary m-t">Dashboard</a>
@@ -34,6 +34,18 @@
<script src="/static/js/bootstrap.min.js"></script>
</body>
-
+<script>
+ function countDown(secs,surl){
+ var jumpTo = document.getElementById('jumpTo');
+ jumpTo.innerHTML= secs + '秒' + 'åŽè¿”回上一页';
+ if(--secs>0){
+ setTimeout("countDown("+secs+",'"+surl+"')",1000);
+ }
+ else{
+ location.href=surl;
+ }
+ }
+ countDown(5,document.referrer);
+</script>
</html>
diff --git a/templates/index.html b/templates/index.html
index 26938446..3b831218 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -62,7 +62,7 @@
</div>
</div>
<div class="row">
- <div class="col-lg-3 border-bottom white-bg dashboard-header" style="margin-left:15px;">
+ <div class="col-lg-3 border-bottom white-bg dashboard-header" style="margin-left:15px;height: 346px">
<h2>活跃用户TOP5</h2>
<small>过去一周共有<span class="text-info">{{ week_users }}</span>ä½ç”¨æˆ·ç™»å½•<span class="text-success">{{ week_hosts }}</span>次æœåŠ¡å™¨.</small>
<ul class="list-group clear-list m-t">
diff --git a/templates/jasset/group_add.html b/templates/jasset/group_add.html
index a3e769de..ead0fecb 100644
--- a/templates/jasset/group_add.html
+++ b/templates/jasset/group_add.html
@@ -8,6 +8,23 @@
<div class="ibox float-e-margins">
<div id="ibox-content" class="ibox-title">
<h5> å¡«å†™ä¸»æœºç»„åŸºæœ¬ä¿¡æ¯ </h5>
+ <div class="ibox-tools">
+ <a class="collapse-link">
+ <i class="fa fa-chevron-up"></i>
+ </a>
+ <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+ <i class="fa fa-wrench"></i>
+ </a>
+ <ul class="dropdown-menu dropdown-user">
+ <li><a href="#">未å¯ç”¨ 1</a>
+ </li>
+ <li><a href="#">未å¯ç”¨ 2</a>
+ </li>
+ </ul>
+ <a class="close-link">
+ <i class="fa fa-times"></i>
+ </a>
+ </div>
</div>
<div class="ibox-content">
{% if emg %}
@@ -124,8 +141,7 @@
}
$('#search').keyup(function() {
- var $rows = $('#groups option');
- console.log($rows);
+ var $rows = $('#hosts option');
var val = $.trim($(this).val()).replace(/ +/g, ' ').toLowerCase();
$rows.show().filter(function() {
diff --git a/templates/jasset/group_detail.html b/templates/jasset/group_detail.html
index a21da279..ee4f0b39 100644
--- a/templates/jasset/group_detail.html
+++ b/templates/jasset/group_detail.html
@@ -8,7 +8,7 @@
<div class="col-lg-12">
<div class="ibox float-e-margins" id="all">
<div class="ibox-title">
- <h5> 主机组<span class="text-info">{{ group_name }}</span>详细信æ¯åˆ—表 </h5>
+ <h5> 主机组<span class="text-info">{{ group.name }}</span>详细信æ¯åˆ—表</h5>
<div class="ibox-tools">
<a class="collapse-link">
<i class="fa fa-chevron-up"></i>
@@ -30,7 +30,7 @@
<div class="ibox-content">
<div class="">
- <a target="_blank" href="/jasset/host_add" class="btn btn-sm btn-primary "> æ·»åŠ ä¸»æœº </a>
+ <a target="_blank" href="/jasset/host_add" class="btn btn-sm btn-primary"> æ·»åŠ ä¸»æœº </a>
</div>
<form id="contents_form" name="contents_form">
@@ -42,7 +42,7 @@
<th class="text-center"> 端å£å· </th>
<th class="text-center" name="j_type"> ç™»å½•æ–¹å¼ </th>
<th class="text-center" name="j_idc"> 所属IDC </th>
- <th class="text-center" id="j_group_name" value="{{ group_name }}"> 所属业务组 </th>
+ <th class="text-center" id="group_id" value="{{ group.id }}"> 所属业务组 </th>
<th class="text-center"> 是å¦æ¿€æ´» </th>
<th class="text-center" name="j_time"> æ·»åŠ æ—¶é—´ </th>
<th class="text-center" name="j_comment"> 备注 </th>
@@ -64,7 +64,7 @@
<td class="text-center" data-editable='false'>
<a value="/jasset/{{ post.ip }}/" class="iframe btn btn-xs btn-primary">详情</a>
<a href="/jasset/host_edit/?id={{ post.id }}" class="btn btn-xs btn-info">编辑</a>
- <a href="/jasset/host_del/{{ post.id }}/" class="btn btn-xs btn-danger">åˆ é™¤</a>
+ <a href="/jasset/group_del_host/?id={{ post.id }}&gid={{ group.id }}" class="btn btn-xs btn-danger">åˆ é™¤</a>
</td>
</tr>
{% endfor %}
@@ -89,21 +89,6 @@
$('#editable').editableTableWidget();
});
- $(".iframe").on('click', function(){
- var url= $(this).attr("value");
- $.layer({
- type: 2,
- title: 'JumpServer主机详情',
- maxmin: true,
- shift: 'top',
- border: [2, 0.3, '#1AB394'],
- shade: [0.5, '#000000'],
- shadeClose: true,
- area : ['800px' , '600px'],
- iframe: {src: url}
- });
- });
-
function alter(form) {
selectData = GetTableDataBox();
if (selectData[1] != 0) {
@@ -122,8 +107,7 @@
function del(form) {
var checkboxes = document.getElementById(form);
var id_list = {};
- var group_name = $('#j_group_name').attr("value");
- console.log(group_name);
+ var group_id = $('#group_id').attr("value");
var j = 0;
for (var i = 0; i < checkboxes.elements.length; i++) {
if (checkboxes.elements[i].type == "checkbox" && checkboxes.elements[i].checked == true && checkboxes.elements[i].value != "checkall") {
@@ -134,8 +118,8 @@
if (confirm("确定从主机组ä¸åˆ 除")) {
$.ajax({
type: "POST",
- url: "/jasset/group_del_host/group/",
- data: {"id_list": id_list, "len_list": j, "group_name": group_name},
+ url: "/jasset/group_del_host/?id=group",
+ data: {"id_list": id_list, "len_list": j, "group_id": group_id},
success: function (data) {
window.open(window.location.href, "_self");
}
diff --git a/templates/jasset/group_list.html b/templates/jasset/group_list.html
index ed350fee..b171df38 100644
--- a/templates/jasset/group_list.html
+++ b/templates/jasset/group_list.html
@@ -7,6 +7,26 @@
<div class="row">
<div class="col-lg-10">
<div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5> 主机组详细信æ¯åˆ—表</h5>
+ <div class="ibox-tools">
+ <a class="collapse-link">
+ <i class="fa fa-chevron-up"></i>
+ </a>
+ <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+ <i class="fa fa-wrench"></i>
+ </a>
+ <ul class="dropdown-menu dropdown-user">
+ <li><a href="#">未å¯ç”¨ 1</a>
+ </li>
+ <li><a href="#">未å¯ç”¨ 2</a>
+ </li>
+ </ul>
+ <a class="close-link">
+ <i class="fa fa-times"></i>
+ </a>
+ </div>
+ </div>
<div class="ibox-content">
<div class="">
<a target="_blank" href="/jasset/group_add" class="btn btn-sm btn-primary "> æ·»åŠ ä¸»æœºç»„ </a>
diff --git a/templates/jasset/host_add_multi.html b/templates/jasset/host_add_multi.html
index 5df6bc89..122ca2ec 100644
--- a/templates/jasset/host_add_multi.html
+++ b/templates/jasset/host_add_multi.html
@@ -42,9 +42,10 @@
{% if smg %}
<div class="alert alert-success text-center">{{ smg }}</div>
{% endif %}
- <h4>按照文本框内主机信æ¯æ ¼å¼å¡«å†™, 多å°ä¸»æœºå›žè½¦æ¢è¡Œ</h4>
+ <p>è¯·ä¸¥æ ¼æŒ‰ç…§æ–‡æœ¬æ¡†å†…ä¸»æœºä¿¡æ¯æ ¼å¼å¡«å†™, 多å°ä¸»æœºå›žè½¦æ¢è¡Œ, å…·ä½“æ ¼å¼å¦‚下: </p>
+ <p class="text-info">IPåœ°å€ ç«¯å£å· ç™»å½•æ–¹å¼ IDCå 所属主机组 所属部门 激活/ç¦ç”¨ 备注 </p>
<form id="assetMulti" method="post" class="form-horizontal">
- <div><textarea id="j_multi" name="j_multi" type="text" placeholder="192.168.1.1 22 LDAP 北京è”通 [网站,æ•°æ®åº“] è¿ç»´éƒ¨ 1 网站æœåŠ¡å™¨" class="form-control" style="width:700px;height:500px">192.168.1.1 22 LDAP 北京è”通 ['网站','æ•°æ®åº“'] ['è¿ç»´éƒ¨'] 1 网站æœåŠ¡å™¨</textarea></div>
+ <div><textarea id="j_multi" name="j_multi" type="text" placeholder="192.168.1.1 22 LDAP 北京è”通 [网站,æ•°æ®åº“] è¿ç»´éƒ¨ 激活 网站æœåŠ¡å™¨" class="form-control" style="width:700px;height:500px">192.168.1.1 22 LDAP 北京è”通 ['网站','æ•°æ®åº“'] ['è¿ç»´éƒ¨','测试部'] 激活 网站æœåŠ¡å™¨</textarea></div>
<div class="hr-line-dashed"></div>
<div class="form-group">
<div class="col-sm-4 col-sm-offset-4">
diff --git a/templates/jasset/host_list_common.html b/templates/jasset/host_list_common.html
index 7bd596f5..3ea78f01 100644
--- a/templates/jasset/host_list_common.html
+++ b/templates/jasset/host_list_common.html
@@ -73,7 +73,7 @@
<td class="text-center" name="j_alias"> {{ post|get_user_alias:user_id }} </td>
<td class="text-center" data-editable='false' name="j_comment"> {{ post.comment }} </td>
<td class="text-center" data-editable='false'>
- <a value="/jasset/{{ post.ip }}/" class="iframe btn btn-xs btn-primary">详情</a>
+ <a href="/jasset/host_detail/?id={{ post.id }}" class="iframe btn btn-xs btn-primary">详情</a>
</td>
</tr>
{% endfor %}
diff --git a/templates/jasset/idc_detail.html b/templates/jasset/idc_detail.html
index 2653d630..847ff7b4 100644
--- a/templates/jasset/idc_detail.html
+++ b/templates/jasset/idc_detail.html
@@ -63,13 +63,16 @@
<td class="text-center" name="j_port"> {{ post.port }} </td>
<td class="text-center" name="j_type"> {{ post.login_type|get_login_type }} </td>
<td class="text-center" name="j_idc"> {{ post.idc.name }} </td>
- <td class="text-center" name="j_group">{{ post.bis_group.all | group_str2 }}</td>
+ <td class="text-center" name="j_dept">{{ post.dept.all | group_str2 }}</td>
+ <td class="text-center" name="j_group">{{ post.bis_group.all | group_str2_all }}</td>
<td class="text-center" name="j_active"> {{ post.is_active|bool2str }} </td>
- <td class="text-center"> {{ post.date_added|date:"Y-m-d H:i:s" }} </td>
<td class="text-center" name="j_comment"> {{ post.comment }} </td>
<td class="text-center" data-editable='false'>
- <a value="/jasset/{{ post.ip }}/" class="iframe btn btn-xs btn-primary">详情</a>
- <a href="/jasset/host_del/{{ post.id }}" class="btn btn-xs btn-danger">åˆ é™¤</a>
+ <a href="/jasset/host_detail/?id={{ post.id }}" class="btn btn-xs btn-primary">详情</a>
+ {% ifnotequal session_role_id 0 %}
+ <a href="/jasset/host_edit/?id={{ post.id }}" class="btn btn-xs btn-info">编辑</a>
+ <a href="/jasset/host_del/{{ post.id }}" class="btn btn-xs btn-danger">åˆ é™¤</a>
+ {% endifnotequal %}
</td>
</tr>
{% endfor %}
@@ -80,38 +83,7 @@
<input type="button" id="del_button" class="btn btn-danger btn-sm" name="del_button" value="åˆ é™¤" onclick="del('contents_form')" />
<input type="button" id="alter_button" class="btn btn-warning btn-sm" name="alter_button" value="修改" onclick="alter('contents_form')" />
</div>
- <div class="col-sm-6">
- <div class="dataTables_paginate paging_simple_numbers" id="editable_paginate">
- <ul class="pagination" style="margin-top: 0; float: right">
-
- {% if contacts.has_previous %}
- <li class="paginate_button previous" aria-controls="editable" tabindex="0" id="editable_previous">
- <a href="?id={{ idc_id }}&page={{ contacts.previous_page_number }}">Previous</a>
- </li>
- {% else %}
- <li class="paginate_button previous disabled" aria-controls="editable" tabindex="0" id="editable_previous">
- <a href="#">Previous</a>
- </li>
- {% endif %}
- {% for page in page_range %}
- {% ifequal current_page page %}
- <li class="paginate_button active" aria-controls="editable" tabindex="0"><a href="?id={{ idc_id }}&page={{ page }}" title="第{{ page }}页">{{ page }}</a></li>
- {% else %}
- <li class="paginate_button" aria-controls="editable" tabindex="0"><a href="?id={{ idc_id }}&page={{ page }}" title="第{{ page }}页">{{ page }}</a></li>
- {% endifequal %}
- {% endfor %}
- {% if contacts.has_next %}
- <li class="paginate_button next" aria-controls="editable" tabindex="0" id="editable_next">
- <a href="?id={{ idc_id }}&page={{ contacts.next_page_number }}">Next</a>
- </li>
- {% else %}
- <li class="paginate_button next disabled" aria-controls="editable" tabindex="0" id="editable_next">
- <a href="#">Next</a>
- </li>
- {% endif %}
- </ul>
- </div>
- </div>
+ {% include 'paginator.html' %}
</div>
</form>
</div>
@@ -125,21 +97,6 @@
$('#editable').editableTableWidget();
});
- $(".iframe").on('click', function(){
- var url= $(this).attr("value");
- $.layer({
- type: 2,
- title: 'JumpServer主机详情',
- maxmin: true,
- shift: 'top',
- border: [2, 0.3, '#1AB394'],
- shade: [0.5, '#000000'],
- shadeClose: true,
- area : ['800px' , '600px'],
- iframe: {src: url}
- });
- });
-
function alter(form) {
selectData = GetTableDataBox();
if (selectData[1] != 0) {
@@ -170,7 +127,7 @@
if (confirm("确定从该IDCä¸åˆ 除")) {
$.ajax({
type: "POST",
- url: "/jasset/group_del_host/idc/",
+ url: "/jasset/host_del/multi/",
data: {"id_list": id_list, "len_list": j, "group_name": group_name},
success: function (data) {
window.open(window.location.href, "_self");
diff --git a/templates/jasset/idc_list.html b/templates/jasset/idc_list.html
index 0e0254dd..e1f5dd46 100644
--- a/templates/jasset/idc_list.html
+++ b/templates/jasset/idc_list.html
@@ -7,6 +7,26 @@
<div class="row">
<div class="col-lg-10">
<div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5> IDC详细信æ¯åˆ—表</h5>
+ <div class="ibox-tools">
+ <a class="collapse-link">
+ <i class="fa fa-chevron-up"></i>
+ </a>
+ <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+ <i class="fa fa-wrench"></i>
+ </a>
+ <ul class="dropdown-menu dropdown-user">
+ <li><a href="#">未å¯ç”¨ 1</a>
+ </li>
+ <li><a href="#">未å¯ç”¨ 2</a>
+ </li>
+ </ul>
+ <a class="close-link">
+ <i class="fa fa-times"></i>
+ </a>
+ </div>
+ </div>
<div class="ibox-content">
<div class="">
{% ifequal session_role_id 2 %}
@@ -66,7 +86,7 @@
<div class="col-sm-6">
{% ifequal session_role_id 2 %}
<input type="button" id="del_button" class="btn btn-danger btn-sm" name="del_button" value="åˆ é™¤" onclick="del('contents_form')" />
- <input type="button" id="alter_button" class="btn btn-warning btn-sm" name="alter_button" value="修改" onclick="alter('contents_form')" />
+ <!--<input type="button" id="alter_button" class="btn btn-warning btn-sm" name="alter_button" value="修改" onclick="alter('contents_form')" />-->
{% endifequal %}
</div>
{% include 'paginator.html' %}
--
2.18.0