github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-03 16:35:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge branches 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver

Browse Source 
Conflicts:
	jasset/views.py
	jumpserver/views.py
This commit is contained in:
guanghongwei
2015-04-08 17:39:00 +08:00
parent b840db12a6
commit 25ce24a17d
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
jasset/views.py
View File

@@ -7,10 +7,7 @@ from django.template import RequestContext
from django.shortcuts import render_to_response from django.shortcuts import render_to_response
from jasset.models import IDC, Asset, BisGroup, AssetAlias from jasset.models import IDC, Asset, BisGroup, AssetAlias
from juser.models import UserGroup, DEPT
from jumpserver.views import jasset_host_edit, pages
from jperm.models import Perm, SudoPerm from jperm.models import Perm, SudoPerm
from jumpserver.views import pages
from jumpserver.api import * from jumpserver.api import *
cryptor = PyCrypt(KEY) cryptor = PyCrypt(KEY)