From 09de12c02a4b4c88e0a629735ae1953d03ef1af6 Mon Sep 17 00:00:00 2001 From: liuzheng712 Date: Sun, 22 Nov 2015 13:04:11 +0800 Subject: [PATCH] index show assets, need discussion --- jumpserver/views.py | 13 +++- juser/views.py | 2 +- templates/index_cu.html | 151 +++++++++++++++++++++++++++++++++++++--- 3 files changed, 153 insertions(+), 13 deletions(-) diff --git a/jumpserver/views.py b/jumpserver/views.py index 57ae3f5dd..a99ec4f56 100644 --- a/jumpserver/views.py +++ b/jumpserver/views.py @@ -16,7 +16,7 @@ from jumpserver.models import Setting from django.contrib.auth import authenticate, login, logout from django.contrib.auth.decorators import login_required from jlog.models import Log - +from jperm.perm_api import get_group_user_perm def getDaysByNum(num): """ @@ -80,6 +80,17 @@ def index_cu(request): login_types = {'L': 'LDAP', 'M': 'MAP'} username = request.user.username # TODO: need fix,liuzheng need Asset help + asset = get_group_user_perm(request.user) + print asset + assets = asset.get('asset') + # idc = [] + # for i in assets: + # idc.append(i.idc.id) + # idc_all = IDC.objects.filter(id__in=idc) + idc_all = [] + for i in assets: + idc_all.append(i.idc) + asset_group_all = asset.get('asset_group') # posts = Asset.object.all() # host_count = len(posts) # diff --git a/juser/views.py b/juser/views.py index 6ddbac281..e0a318433 100644 --- a/juser/views.py +++ b/juser/views.py @@ -12,7 +12,7 @@ from juser.user_api import * MAIL_FROM = EMAIL_HOST_USER - +@login_required(login_url='/login') def chg_role(request): role = {'SU': 2, 'GA': 1, 'CU': 0} if request.session['role_id'] > 0: diff --git a/templates/index_cu.html b/templates/index_cu.html index 3edb68a75..bfc8ef030 100644 --- a/templates/index_cu.html +++ b/templates/index_cu.html @@ -53,18 +53,147 @@
- - {% for host_five in new_posts %} - - {% for host in host_five %} - + +
+ +
+
+ +
+ +
+ +
+
+ +
+
+
+ + + +
+ + +
+
+
+ +
+
{{ host.ip }}
+ + + + + + + + {# #} + + + + + + + {% for asset in assets %} + + + + + + + {# #} + + + + {% endfor %} - - {% endfor %} -
+ + 主机名 IP地址 IDC 所属主机组 配置信息 操作系统 使用默认管理 操作
+ + {{ asset.hostname|default_if_none:"" }} {{ asset.ip|default_if_none:"" }} {{ asset.idc.name|default_if_none:"" }} {{ asset.group.all|group_str2 }}{{ asset.cpu }}|{{ asset.memory }}|{{ asset.disk }} + {{ asset.system_type|default_if_none:"" }}{{ asset.system_version|default_if_none:"" }} {{ asset.use_default_auth|bool2str }} + 详情 + {% ifnotequal session_role_id 0 %} + {% if user.role == 'admin' %} + + 编辑 + 更新 + 删除 + {% endif %} + {% endifnotequal %} +
- {% ifequal host_count 0 %} - (空) - {% endifequal %} + + +
+
+ {% if user.role == 'admin' %} + + 修改 + {% endif %} +
+ {% include 'paginator.html' %} +
+