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

Merge branch 'master' into guanghongwei

pull/6/head
guanghongwei 2015-01-10 14:00:02 +08:00
parent 94beae5282 e5fe13337b
commit f9abf7af1d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jasset/views.py
View File

@ -7,7 +7,7 @@ from django.shortcuts import render_to_response
from django.http import HttpResponseRedirect from django.http import HttpResponseRedirect
from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
from models import IDC, Asset, Group from models import IDC, Asset, UserGroup
from connect import PyCrypt, KEY from connect import PyCrypt, KEY
@ -20,7 +20,7 @@ def jadd(request):
groups = [] groups = []
cryptor = PyCrypt(KEY) cryptor = PyCrypt(KEY)
eidc = IDC.objects.all() eidc = IDC.objects.all()
egroup = Group.objects.all() egroup = UserGroup.objects.all()
is_actived = {'active': 1, 'no_active': 0} is_actived = {'active': 1, 'no_active': 0}
login_typed = {'LDAP': 'L', 'SSH_KEY': 'S', 'PASSWORD': 'P', 'MAP': 'M'} login_typed = {'LDAP': 'L', 'SSH_KEY': 'S', 'PASSWORD': 'P', 'MAP': 'M'}
@ -40,7 +40,7 @@ def jadd(request):
j_idc = IDC.objects.get(name=j_idc) j_idc = IDC.objects.get(name=j_idc)
for group in j_group: for group in j_group:
c = Group.objects.get(name=group) c = UserGroup.objects.get(name=group)
groups.append(c) groups.append(c)
if Asset.objects.filter(ip=str(j_ip)): if Asset.objects.filter(ip=str(j_ip)):