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

修改nav.html

pull/6/head
guanghongwei 2015-03-21 15:08:16 +08:00
parent d8a6eba2f3
commit 2f7e7b0072
4 changed files with 30 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
docs/AddUserAsset.py
View File

@ -127,13 +127,13 @@ def test_add_log():
if __name__ == '__main__':
#install()
#test_add_dept()
#test_add_group()
#test_add_user()
#test_add_idc()
#test_add_asset_group()
#test_add_asset()
install()
test_add_dept()
test_add_group()
test_add_user()
test_add_idc()
test_add_asset_group()
test_add_asset()
test_add_log()

2
jumpserver/api.py
View File

@ -257,7 +257,7 @@ def asset_perm_api(asset):
user_group_list = []
for perm in perm_list:
user_group_list.extend(perm.user_group.all())
user_group_list.append(perm.user_group)
user_permed_list = []
for user_group in user_group_list:

6
juser/views.py
View File

@ -2,24 +2,18 @@
# Author: Guanghongwei
# Email: ibuler@qq.com
import time
import os
import random
import subprocess
from Crypto.PublicKey import RSA
import crypt
from django.http import HttpResponseRedirect
import datetime
from django.shortcuts import render_to_response
from django.core.exceptions import ObjectDoesNotExist
from django.db.models import Q
from django.template import RequestContext
from django.http import HttpResponse
from juser.models import UserGroup, User, DEPT
from connect import BASE_DIR
from connect import CONF
from jumpserver.views import md5_crypt, LDAPMgmt, LDAP_ENABLE, ldap_conn, page_list_return, pages
from jumpserver.api import *

65
templates/nav.html
View File

@ -50,21 +50,16 @@
</li>
</ul>
</li>
{# <li id="jlog">#}
{# <a href="#"><i class="fa fa-files-o"></i> <span class="nav-label">鏃ュ織瀹¤</span><span class="fa arrow"></span></a>#}
{# <ul class="nav nav-second-level">#}
{# <li id="log_list"><a href="/jlog/log_list/online/">鏌ョ湅鏃ュ織</a></li>#}
{# <li id="log_detail"><a href="/jlog/log_detail/">鏃ュ織鍒嗘瀽</a></li>#}
{# </ul>#}
{# </li>#}
<li id="jlog">
<a href="#"><i class="fa fa-files-o"></i> <span class="nav-label">鏃ュ織瀹¤</span><span class="fa arrow"></span></a>
<ul class="nav nav-second-level">
<li id="log_list"><a href="/jlog/log_list/online/">鏌ョ湅鏃ュ織</a></li>
<li id="log_detail"><a href="/jlog/log_detail/">鏃ュ織鍒嗘瀽</a></li>
</ul>
<a href="/jlog/log_list/online/"><i class="fa fa-files-o"></i> <span class="nav-label">鏃ュ織瀹¤</span><span class="label label-info pull-right"></span></a>
</li>
<li>
<a href="#"><i class="fa fa-download"></i> <span class="nav-label">涓婁紶涓嬭浇</span><span class="fa arrow"></span></a>
<ul class="nav nav-second-level">
<li><a href="/file/upload/">鏂囦欢涓婁紶</a></li>
<li><a href="/file/download/">鏂囦欢涓嬭浇</a></li>
</ul>
</li>
<li class="special_link">
<a href="http://www.jumpserver.org" target="_blank"><i class="fa fa-database"></i> <span class="nav-label">璁块棶瀹樼綉</span></a>
</li>
@ -120,18 +115,7 @@
</ul>
</li>
<li id="jlog">
<a href="#"><i class="fa fa-files-o"></i> <span class="nav-label">鏃ュ織瀹¤</span><span class="fa arrow"></span></a>
<ul class="nav nav-second-level">
<li id="log_list"><a href="/jlog/log_list/online/">鏌ョ湅鏃ュ織</a></li>
<li id="log_detail"><a href="/jlog/log_detail/">鏃ュ織鍒嗘瀽</a></li>
</ul>
</li>
<li>
<a href="#"><i class="fa fa-download"></i> <span class="nav-label">涓婁紶涓嬭浇</span><span class="fa arrow"></span></a>
<ul class="nav nav-second-level">
<li><a href="/file/upload/">鏂囦欢涓婁紶</a></li>
<li><a href="/file/download/">鏂囦欢涓嬭浇</a></li>
</ul>
<a href="/jlog/log_list/online/"><i class="fa fa-files-o"></i> <span class="nav-label">鏃ュ織瀹¤</span><span class="label label-info pull-right"></span></a>
</li>
<li class="special_link">
@ -150,27 +134,19 @@
<li>
<a href="/"><i class="fa fa-th-large"></i> <span class="nav-label">浠〃鐩</span><span class="label label-info pull-right"></span></a>
</li>
<li id="juser">
<a href="#"><i class="fa fa-rebel"></i> <span class="nav-label">鐢ㄦ埛绠＄悊</span><span class="fa arrow"></span></a>
<ul class="nav nav-second-level">
<li id="user_list"><a href="/juser/user_list/">鏌ョ湅鐢ㄦ埛<span class="label {% ifequal user_active_num user_total_num %}label-primary {% else %}label-warning {% endifequal %}pull-right">{{ user_active_num }}/{{ user_total_num }}</span></a></li>
</ul>
<li>
<a href="/"><i class="fa fa-rebel"></i> <span class="nav-label">涓汉淇℃伅</span><span class="label label-info pull-right"></span></a>
</li>
<li id="jasset">
<a><i class="fa fa-cube"></i> <span class="nav-label">璧勪骇绠＄悊</span><span class="fa arrow"></span></a>
<ul class="nav nav-second-level">
<li class="host_list"><a href="/jasset/host_list/">鏌ョ湅璧勪骇&nbsp&nbsp</span><span class="label label-info pull-right">16/18</span></a></li>
<li class="jgroup_list group_detail"><a href="/jasset/jgroup_list/">鏌ョ湅涓绘満缁</a></li>
<li class="idc_list idc_detail"><a href="/jasset/idc_list/">鏌ョ湅IDC</a></li>
</ul>
<li>
<a href="/"><i class="fa fa-cube"></i> <span class="nav-label">鏌ョ湅涓绘満</span><span class="label label-info pull-right"></span></a>
</li>
<li id="jlog">
<a href="#"><i class="fa fa-files-o"></i> <span class="nav-label">鏃ュ織瀹¤</span><span class="fa arrow"></span></a>
<ul class="nav nav-second-level">
<li id="log_list"><a href="/jlog/log_list/online/">鏌ョ湅鏃ュ織</a></li>
<li id="log_detail"><a href="/jlog/log_detail/">鏃ュ織鍒嗘瀽</a></li>
</ul>
<li>
<a href="/"><i class="fa fa-cube"></i> <span class="nav-label">鐢宠涓绘満</span><span class="label label-info pull-right"></span></a>
</li>
<li>
<a href="/"><i class="fa fa-files-o"></i> <span class="nav-label">鐧诲綍鍘嗗彶</span><span class="label label-info pull-right"></span></a>
</li>
<li>
<a href="#"><i class="fa fa-download"></i> <span class="nav-label">涓婁紶涓嬭浇</span><span class="fa arrow"></span></a>
<ul class="nav nav-second-level">
@ -178,6 +154,9 @@
<li><a href="/file/download/">鏂囦欢涓嬭浇</a></li>
</ul>
</li>
<li>
<a href="/"><i class="fa fa-files-o"></i> <span class="nav-label">浣跨敤璇存槑</span><span class="label label-info pull-right"></span></a>
</li>
<li class="special_link">
<a href="http://www.jumpserver.org" target="_blank"><i class="fa fa-database"></i> <span class="nav-label">璁块棶瀹樼綉</span></a>