diff --git a/docs/AddUserAsset.py b/docs/AddUserAsset.py index 3e21ef3b6..68d5d31a0 100644 --- a/docs/AddUserAsset.py +++ b/docs/AddUserAsset.py @@ -24,14 +24,6 @@ def test_add_idc(): print 'Add: %s' % name -def test_add_asset_group(): - BisGroup.objects.create(name='ALL', type='A', comment='ALL') - for i in range(1, 20): - name = 'AssetGroup' + str(i) - BisGroup.objects.create(name=name, type='A', comment=name) - print 'Add: %s' % name - - def test_add_dept(): for i in range(1, 100): name = 'DEPT' + str(i) @@ -73,18 +65,36 @@ def test_add_user(): print "Add: %s" % username +def test_add_asset_group(): + BisGroup.objects.create(name='ALL', type='A', comment='ALL') + user_all = Asset.objects.all() + for i in range(1, 20): + name = 'AssetGroup' + str(i) + group = BisGroup(name=name, type='A', comment=name) + group.save() + print 'Add: %s' % name + + def test_add_asset(): - test_idc = IDC.objects.get(id=1) + idc_all = IDC.objects.all() + test_idc = random.choice(idc_all) + bis_group_all = BisGroup.objects.all() for i in range(1, 500): ip = '192.168.1.' + str(i) - Asset.objects.create(ip=ip, port=22, login_type='L', idc=test_idc, is_active=True, comment='test') + asset = Asset(ip=ip, port=22, login_type='L', idc=test_idc, is_active=True, comment='test') + asset.save() + asset.bis_group = [random.choice(bis_group_all) for i in range(2)] print "Add: %s" % ip if __name__ == '__main__': - test_add_dept() - test_add_group() + #test_add_dept() + #test_add_group() #test_add_user() + #test_add_idc() + #test_add_asset_group() + test_add_asset() + diff --git a/jperm/views.py b/jperm/views.py index 036177ad8..959b9e318 100644 --- a/jperm/views.py +++ b/jperm/views.py @@ -35,25 +35,6 @@ 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_list(request): - header_title, path1, path2 = u'主机授权 | Perm Host Detail.', u'授权管理', u'授权详情' - groups = contact_list = Perm.objects.all() - users = contact_list2 = User.objects.all().order_by('id') - p = paginator = Paginator(contact_list, 10) - try: - current_page = int(request.GET.get('page', '1')) - except ValueError: - current_page = 1 - - page_range = page_list_return(len(p.page_range), current_page) - - try: - contacts = paginator.page(current_page) - except (EmptyPage, InvalidPage): - contacts = paginator.page(paginator.num_pages) - return render_to_response('jperm/perm_list.html', locals(), context_instance=RequestContext(request)) - - def user_asset_cmd_groups_get(user_groups_select='', asset_groups_select='', cmd_groups_select=''): user_groups_select_list = [] asset_groups_select_list = [] @@ -72,10 +53,10 @@ def user_asset_cmd_groups_get(user_groups_select='', asset_groups_select='', cmd def perm_add(request): - header_title, path1, path2 = u'主机授权添加 | Perm Add Detail.', u'授权管理', u'授权添加' + header_title, path1, path2 = u'主机授权添加.', u'授权管理', u'授权添加' if request.method == 'GET': - user_groups = UserGroup.objects.all() + user_groups = UserGroup.objects.filter(id__gt=2) asset_groups = BisGroup.objects.all() else: @@ -95,6 +76,25 @@ def perm_add(request): return render_to_response('jperm/perm_add.html', locals(), context_instance=RequestContext(request)) +def perm_list(request): + header_title, path1, path2 = u'主机授权', u'授权管理', u'授权详情' + contact_list = Perm.objects.all() + contact_list2 = User.objects.all().order_by('id') + p = paginator = Paginator(contact_list, 10) + try: + current_page = int(request.GET.get('page', '1')) + except ValueError: + current_page = 1 + + page_range = page_list_return(len(p.page_range), current_page) + + try: + contacts = paginator.page(current_page) + except (EmptyPage, InvalidPage): + contacts = paginator.page(paginator.num_pages) + return render_to_response('jperm/perm_list.html', locals(), context_instance=RequestContext(request)) + + def perm_list_ajax(request): tab = request.POST.get('tab', 'tab1') search = request.POST.get('search', '') @@ -132,7 +132,7 @@ def perm_list_ajax(request): def perm_edit(request): if request.method == 'GET': - header_title, path1, path2 = u'编辑授权 | Perm Host Edit.', u'授权管理', u'授权编辑' + header_title, path1, path2 = u'编辑授权', u'授权管理', u'授权编辑' perm_id = request.GET.get('id') perm = Perm.objects.filter(id=perm_id) if perm: @@ -156,7 +156,7 @@ def perm_edit(request): def perm_detail(request): - header_title, path1, path2 = u'编辑授权 | Perm Host Edit.', u'授权管理', u'授权详情' + header_title, path1, path2 = u'编辑授权', u'授权管理', u'授权详情' perm_id = request.GET.get('id') perm = Perm.objects.filter(id=perm_id) if perm: @@ -185,7 +185,7 @@ def perm_del(request): def perm_asset_detail(request): - header_title, path1, path2 = u'用户授权主机 | User Perm Asset.', u'权限管理', u'用户主机详情' + header_title, path1, path2 = u'用户授权主机', u'权限管理', u'用户主机详情' user_id = request.GET.get('id') user = User.objects.filter(id=user_id) if user: @@ -268,7 +268,7 @@ def sudo_ldap_add(name, users_runas, user_groups_select, asset_groups_select, def sudo_add(request): - header_title, path1, path2 = u'Sudo授权 | Perm Sudo Add.', u'权限管理', u'添加Sudo权限' + header_title, path1, path2 = u'Sudo授权', u'权限管理', u'添加Sudo权限' user_groups = UserGroup.objects.all() asset_groups = BisGroup.objects.all() cmd_groups = CmdGroup.objects.all() @@ -290,7 +290,7 @@ def sudo_add(request): def sudo_list(request): - header_title, path1, path2 = u'Sudo授权 | Perm Sudo Detail.', u'权限管理', u'Sudo权限详情' + header_title, path1, path2 = u'Sudo授权', u'权限管理', u'Sudo权限详情' sudo_perms = contact_list = SudoPerm.objects.all() p1 = paginator1 = Paginator(contact_list, 10) user_groups = UserGroup.objects.filter(Q(type='A') | Q(type='P')) @@ -310,7 +310,7 @@ def sudo_list(request): def sudo_edit(request): - header_title, path1, path2 = u'Sudo授权 | Perm Sudo Detail.', u'授权管理', u'Sudo修改' + header_title, path1, path2 = u'Sudo授权', u'授权管理', u'Sudo修改' if request.method == 'GET': sudo_perm_id = request.GET.get('id', '0') @@ -356,7 +356,7 @@ def sudo_edit(request): def sudo_detail(request): - header_title, path1, path2 = u'Sudo授权详情 | Perm Sudo Detail.', u'授权管理', u'授权详情' + header_title, path1, path2 = u'Sudo授权详情', u'授权管理', u'授权详情' sudo_perm_id = request.GET.get('id') sudo_perm = SudoPerm.objects.filter(id=sudo_perm_id) if sudo_perm: @@ -391,7 +391,7 @@ def sudo_del(request): def cmd_add(request): - header_title, path1, path2 = u'sudo命令添加 | Sudo Cmd Add.', u'授权管理管理', u'命令组添加' + header_title, path1, path2 = u'sudo命令添加', u'授权管理', u'命令组添加' if request.method == 'POST': name = request.POST.get('name') @@ -407,7 +407,7 @@ def cmd_add(request): def cmd_edit(request): - header_title, path1, path2 = u'sudo命令修改 | Sudo Cmd Edit.', u'授权管理管理', u'命令组修改' + header_title, path1, path2 = u'sudo命令修改', u'授权管理管理', u'命令组修改' cmd_group_id = request.GET.get('id') cmd_group = CmdGroup.objects.filter(id=cmd_group_id) @@ -433,7 +433,7 @@ def cmd_edit(request): def cmd_list(request): - header_title, path1, path2 = u'sudo命令查看 | Sudo Cmd List.', u'权限管理', u'Sudo命令添加' + header_title, path1, path2 = u'sudo命令查看', u'权限管理', u'Sudo命令添加' cmd_groups = contact_list = CmdGroup.objects.all() p = paginator = Paginator(contact_list, 10) diff --git a/jumpserver/context_processors.py b/jumpserver/context_processors.py index bab3bb5a3..8edd4d370 100644 --- a/jumpserver/context_processors.py +++ b/jumpserver/context_processors.py @@ -1,5 +1,12 @@ +from juser.models import User + def name_proc(request): user_id = request.session.get('user_id') role = request.session.get('role_id') - return {'user_id': user_id, 'role_id': role} \ No newline at end of file + user_total_num = User.objects.all().count() + user_active_num = User.objects.filter(is_active=True).count() + + return {'session_user_id': user_id, 'session_role_id': role, + 'user_total_num': user_total_num, 'user_active_num': user_active_num} + diff --git a/jumpserver/templatetags/mytags.py b/jumpserver/templatetags/mytags.py index 66090f85d..41d9339df 100644 --- a/jumpserver/templatetags/mytags.py +++ b/jumpserver/templatetags/mytags.py @@ -41,10 +41,10 @@ def groups_str(user_id): user = User.objects.get(id=user_id) for group in user.group.all(): groups.append(group.name) - if len(groups) < 4: + if len(groups) < 3: return ' '.join(groups) else: - return "%s ..." % ' '.join(groups[0:3]) + return "%s ..." % ' '.join(groups[0:2]) @register.filter(name='group_manage_str') diff --git a/juser/views.py b/juser/views.py index 3b5838c8a..7c9bd06ee 100644 --- a/juser/views.py +++ b/juser/views.py @@ -427,7 +427,7 @@ def group_update_member(group_id, users_id_list): def group_edit(request): error = '' msg = '' - header_title, path1, path2 = '修改属组 | Edit Group', 'juser', 'group_edit' + header_title, path1, path2 = '修改小组信息', '用户管理', '编辑小组' if request.method == 'GET': group_id = request.GET.get('id', '') group = UserGroup.objects.filter(id=group_id) diff --git a/templates/jperm/perm_add.html b/templates/jperm/perm_add.html index e00c81e44..e65f960b3 100644 --- a/templates/jperm/perm_add.html +++ b/templates/jperm/perm_add.html @@ -8,7 +8,7 @@
-
主机授权 Perm Add info.
+
主机授权添加
diff --git a/templates/jperm/perm_asset_detail.html b/templates/jperm/perm_asset_detail.html index a500c2458..8be1ece6b 100644 --- a/templates/jperm/perm_asset_detail.html +++ b/templates/jperm/perm_asset_detail.html @@ -9,7 +9,7 @@
-
授权主机 Asset.
+
授权主机详情
diff --git a/templates/jperm/perm_detail.html b/templates/jperm/perm_detail.html index 2159ddd2e..4cf28bfe7 100644 --- a/templates/jperm/perm_detail.html +++ b/templates/jperm/perm_detail.html @@ -55,7 +55,7 @@
-
授权主机 Asset.
+
授权详情
diff --git a/templates/jperm/perm_edit.html b/templates/jperm/perm_edit.html index e5650ef2f..5f98313c4 100644 --- a/templates/jperm/perm_edit.html +++ b/templates/jperm/perm_edit.html @@ -8,7 +8,7 @@
-
主机授权 Perm Add info.
+
主机授权修改
diff --git a/templates/jperm/perm_list.html b/templates/jperm/perm_list.html index aef677c80..de918b4ba 100644 --- a/templates/jperm/perm_list.html +++ b/templates/jperm/perm_list.html @@ -8,7 +8,7 @@
-
用户组授权 show host perm info.
+
授权列表
@@ -33,8 +33,8 @@
    -
  • 授权查看
    • -
  • 用户授权详情
    • +
  • 授权查看
    • +
  • 用户授权详情
  • @@ -130,68 +130,68 @@
    -{# #} -{# #} -{# #} -{# #} -{# #} -{# #} -{# #} -{# #} -{# #} -{# #} -{# #} -{# {% for user in contacts2.object_list %}#} -{# #} -{# #} -{# #} -{# #} -{# #} -{# #} -{# #} -{# {% endfor %}#} -{# #} -{#
    用户角色属组主机数量操作
    {{ user.name }} {{ user.id | get_role }} {{ user.username | groups_str }} {{ user.id | perm_asset_count }} #} -{# 详情#} -{#
    #} -{#
    #} -{#
    #} -{#
    #} -{# Showing {{ contacts2.start_index }} to {{ contacts2.end_index }} of {{ p2.count }} entries#} -{#
    #} -{#
    #} -{#
    #} -{#
    #} -{#
      #} -{# {% if contacts2.has_previous %}#} -{# #} -{# {% else %}#} -{# #} -{# {% endif %}#} -{# {% for page in page_range2 %}#} -{# {% ifequal current_page page %}#} -{#
    • {{ page }}
      • #} -{# {% else %}#} -{#
    • {{ page }}
      • #} -{# {% endifequal %}#} -{# {% endfor %}#} -{# {% if contacts2.has_next %}#} -{# #} -{# {% else %}#} -{# #} -{# {% endif %}#} -{#
    #} -{#
    #} -{#
    #} -{#
    #} + + + + + + + + + + + + {% for user in contacts2.object_list %} + + + + + + + + {% endfor %} + +
    用户角色属组主机数量操作
    {{ user.name }} {{ user.id | get_role }} {{ user.username | groups_str }} {{ user.id | perm_asset_count }} + 详情 +
    +
    +
    +
    + Showing {{ contacts2.start_index }} to {{ contacts2.end_index }} of {{ p2.count }} entries +
    +
    +
    +
    +
      + {% if contacts2.has_previous %} + + {% else %} + + {% endif %} + {% for page in page_range2 %} + {% ifequal current_page page %} +
    • {{ page }}
      • + {% else %} +
    • {{ page }}
      • + {% endifequal %} + {% endfor %} + {% if contacts2.has_next %} + + {% else %} + + {% endif %} +
    +
    +
    +
diff --git a/templates/jperm/perm_user_detail.html b/templates/jperm/perm_user_detail.html index aef677c80..3a17821a4 100644 --- a/templates/jperm/perm_user_detail.html +++ b/templates/jperm/perm_user_detail.html @@ -8,7 +8,7 @@
-
用户组授权 show host perm info.
+
用户授权详情
diff --git a/templates/jperm/sudo_add.html b/templates/jperm/sudo_add.html index cf2e93ddd..522612192 100644 --- a/templates/jperm/sudo_add.html +++ b/templates/jperm/sudo_add.html @@ -8,7 +8,7 @@
-
Sudo授权 show sudo perm info.
+
Sudo授权添加
diff --git a/templates/jperm/sudo_cmd_add.html b/templates/jperm/sudo_cmd_add.html index 3dc572e6e..a012c17a3 100644 --- a/templates/jperm/sudo_cmd_add.html +++ b/templates/jperm/sudo_cmd_add.html @@ -7,7 +7,7 @@
-
填写基本信息 Fill Cmd info.
+
填写基本信息
diff --git a/templates/jperm/sudo_cmd_list.html b/templates/jperm/sudo_cmd_list.html index 50ee493e7..78b25e196 100644 --- a/templates/jperm/sudo_cmd_list.html +++ b/templates/jperm/sudo_cmd_list.html @@ -8,7 +8,7 @@
-
查看分组 show group info.
+
查看命令分组
diff --git a/templates/jperm/sudo_detail.html b/templates/jperm/sudo_detail.html index bd4a1bb5e..39fd1393d 100644 --- a/templates/jperm/sudo_detail.html +++ b/templates/jperm/sudo_detail.html @@ -8,7 +8,7 @@
-
授权用户 User.
+
Sudo授权详情
diff --git a/templates/jperm/sudo_edit.html b/templates/jperm/sudo_edit.html index 87df22fa4..7e0a8f826 100644 --- a/templates/jperm/sudo_edit.html +++ b/templates/jperm/sudo_edit.html @@ -8,7 +8,7 @@
-
Sudo授权 show sudo perm info.
+
Sudo授权编辑
diff --git a/templates/jperm/sudo_list.html b/templates/jperm/sudo_list.html index 7c8fabd27..182c42ed3 100644 --- a/templates/jperm/sudo_list.html +++ b/templates/jperm/sudo_list.html @@ -8,7 +8,7 @@
-
Sudo授权 show sudo perm info.
+
Sudo授权列表
diff --git a/templates/juser/user_list.html b/templates/juser/user_list.html index 9fe381569..5785d3f89 100644 --- a/templates/juser/user_list.html +++ b/templates/juser/user_list.html @@ -8,7 +8,7 @@
-
查看用户 show user info.
+
查看用户
diff --git a/templates/nav.html b/templates/nav.html index 931dff352..7a6cca4d6 100644 --- a/templates/nav.html +++ b/templates/nav.html @@ -14,12 +14,12 @@
  • 用户管理
  • @@ -34,34 +34,25 @@
  • 授权管理
  • diff --git a/templates/nav_li_profile.html b/templates/nav_li_profile.html index d1dc24d77..e5a02fd4e 100644 --- a/templates/nav_li_profile.html +++ b/templates/nav_li_profile.html @@ -1,11 +1,11 @@ {% load mytags %}
  • - image + image {# image#} - {{ user_id | to_name}} + {{ session_user_id | to_name}} {{ role_id | to_role_name }}