diff --git a/jpermission/views.py b/jpermission/views.py index d850f3d8d..c3d5e59fc 100644 --- a/jpermission/views.py +++ b/jpermission/views.py @@ -1,10 +1,29 @@ # coding: utf-8 from django.shortcuts import render_to_response +from django.http import HttpResponseRedirect from juser.models import User +from jasset.models import Asset def perm_user_list(request): header_title, path1, path2 = u'查看授权用户 | Perm User Detail.', u'授权管理', u'用户详情' users = User.objects.all() return render_to_response('jperm/perm_user_list.html', locals(),) + + +def perm_add(request): + header_title, path1, path2 = u'添加授权 | Add User perm.', u'授权管理', u'添加授权' + username = request.GET.get('username', None) + if not username: + return HttpResponseRedirect('/') + + user = User.objects.get(username=username) + permed_hosts = [] + for perm in user.permission_set.all(): + permed_hosts.append(perm.asset) + + hosts_all = Asset.objects.all() + hosts = list(set(hosts_all) - set(permed_hosts)) + + return render_to_response('jperm/perm_add.html', locals()) \ No newline at end of file diff --git a/templates/jperm/perm_add.html b/templates/jperm/perm_add.html index 7506b04ad..dcfde9f25 100644 --- a/templates/jperm/perm_add.html +++ b/templates/jperm/perm_add.html @@ -8,7 +8,7 @@
-
添加授权 Add perm info.
+
添加授权 {{ user.name }} Add perm info.
@@ -36,104 +36,18 @@
{{ msg }}
{% endif %}
-
- -
-
-
-
- -
- - - 登陆web的密码 - -
-
-
-
- -
- - - 登陆 Jumpserver 使用的SSH密钥的密码 - -
-
-
-
- -
- -
-
-
-
- -
- + {% for host in hosts %} + {% endfor %} + {% for host in hosts %} + + {% endfor %}
-
-
- -
- -
-
-
-
- -
- - - 如果使用password方式，该密码是用户在后端服务器的密码 - -
-
-
-
- -
- -
-
-
-
-
-
- -
-
- -
-
-
+
diff --git a/templates/jperm/perm_user_list.html b/templates/jperm/perm_user_list.html index e3dd1252f..ce7de5469 100644 --- a/templates/jperm/perm_user_list.html +++ b/templates/jperm/perm_user_list.html @@ -41,7 +41,7 @@ {{ user.id }} {{ user.username }} - 添加授权 + 添加授权 {% endfor %}