Merge branch 'master' into guanghongwei

jasset/views.py

@@ -7,7 +7,7 @@ from django.shortcuts import render_to_response
 from django.http import HttpResponseRedirect
 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
 
 
@@ -20,7 +20,7 @@ def jadd(request):
     groups = []
     cryptor = PyCrypt(KEY)
     eidc = IDC.objects.all()
-    egroup = Group.objects.all()
+    egroup = UserGroup.objects.all()
     is_actived = {'active': 1, 'no_active': 0}
     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)
         for group in j_group:
-            c = Group.objects.get(name=group)
+            c = UserGroup.objects.get(name=group)
             groups.append(c)
 
         if Asset.objects.filter(ip=str(j_ip)):