connect.py�޸�

jperm/views.py

@@ -25,8 +25,11 @@ def perm_group_update(user_group_name='', user_group_id='', asset_groups_name=''
             Perm(user_group=user_group, asset_group=asset_group).save()
 
 
-def perm_user_asset(user_id):
-    user = User.objects.get(id=user_id)
+def perm_user_asset(user_id=None, username=None):
+    if user_id:
+        user = User.objects.get(id=user_id)
+    else:
+        user = User.objects.get(username=username)
     user_groups = user.user_group.all()
     perms = []
     assets = []
@@ -99,84 +102,3 @@ def perm_asset_detail(request):
     return render_to_response('jperm/perm_asset_detail.html', locals())
 
 
-# def perm_user_host(username, ips):
-#     user = User.objects.get(username=username)
-#     user.perm_set.all().delete()
-#     for ip in ips:
-#         asset = Asset.objects.get(ip=ip)
-#         Perm.objects.create(user=user, asset=asset)
-#
-#
-# def perm_user_edit(request):
-#     header_title, path1, path2 = u'授权编辑 | Perm Edit.', u'jperm', u'perm_edit'
-#     if request.method == 'GET':
-#         if request.GET.get('id', None):
-#             user_id = request.GET.get('id')
-#             user = User.objects.get(id=user_id)
-#             assets = Asset.objects.all()
-#             assets_permed = []
-#             for perm in user.perm_set.all():
-#                 assets_permed.append(perm.asset)
-#             assets_unperm = list(set(assets)-set(assets_permed))
-#             return render_to_response('jperm/perm_user_edit.html', locals())
-#     else:
-#         host_ips = request.POST.getlist('host_permed', '')
-#         username = request.POST.get('username')
-#         perm_user_host(username, host_ips)
-#
-#         return HttpResponseRedirect('/jperm/perm_host/')
-#
-#
-# def perm_user_detail(request):
-#     user_id = request.GET.get('id', '')
-#     user = User.objects.get(id=user_id)
-#     host_permed = []
-#     for perm in user.perm_set.all():
-#         host_permed.append(perm.asset)
-#
-#     return render_to_response('jperm/perm_detail.html', locals())
-#
-#
-# def perm_group_edit(request):
-#     if request.method == 'GET':
-#         group_id = request.GET.get('id', '')
-#         group = UserGroup.objects.get(id=group_id)
-#
-#         return render_to_response('jperm/perm_group_edit.html')
-#
-#
-# def perm_add(request):
-#     header_title, path1, path2 = u'添加授权 | Add User perm.', u'授权管理', u'添加授权'
-#     if request.method == 'GET':
-#         username = request.GET.get('username', None)
-#         if not username:
-#             return HttpResponseRedirect('/')
-#
-#         user = User.objects.get(username=username)
-#         permed_hosts = []
-#         for perm in user.perm_set.all():
-#             permed_hosts.append(perm.asset)
-#
-#         hosts_all = Asset.objects.all()
-#         hosts = list(set(hosts_all) - set(permed_hosts))
-#
-#     else:
-#         username = request.POST.get('username', None)
-#         host_ids = request.POST.getlist('host_ids', None)
-#
-#         user = User.objects.get(username=username)
-#         for host_id in host_ids:
-#             asset = Asset.objects.get(id=host_id)
-#             perm = Perm(user=user, asset=asset)
-#             perm.save()
-#             msg = u'添加成功'
-#
-#     return render_to_response('jperm/perm_add.html', locals())
-#
-#
-# def perm_user_show(request):
-#     header_title, path1, path2 = u'查看授权用户 | Perm User Detail.', u'授权管理', u'用户详情'
-#     users = User.objects.all()
-#     return render_to_response('jperm/perm_user_show.html', locals(),)
-
-