diff --git a/jumpserver.py b/jumpserver.py index a86a20478..2c38a7371 100755 --- a/jumpserver.py +++ b/jumpserver.py @@ -18,9 +18,7 @@ import paramiko import pxssh import pexpect -cur_dir = os.path.dirname(__file__) -if not cur_dir: - cur_dir = "./" +cur_dir = os.path.abspath(os.path.dirname(__file__)) sys.path.append('%s/webroot/AutoSa/' % cur_dir) os.environ['DJANGO_SETTINGS_MODULE'] = 'AutoSa.settings' diff --git a/webroot/AutoSa/AutoSa/views.py b/webroot/AutoSa/AutoSa/views.py index ca765bbd2..c62cd6472 100644 --- a/webroot/AutoSa/AutoSa/views.py +++ b/webroot/AutoSa/AutoSa/views.py @@ -320,9 +320,21 @@ def showUser(request): error = '' if is_super_user(request): - users = User.objects.all() + users_all = User.objects.all() else: - users = group_member(request.session.get('username')) + users_all = group_member(request.session.get('username')) + + paginator = Paginator(users_all, 20) + + try: + page = int(request.GET.get('page', 1)) + except ValueError: + page = 1 + + try: + users = paginator.page(page) + except (EmptyPage, InvalidPage): + users = paginator.page(paginator.num_pages) if request.method == 'POST': selected_user = request.REQUEST.getlist('selected') @@ -680,13 +692,25 @@ def showAssets(request): """查看服务器""" info = '' if request.session.get('admin') < 2: - assets = [] + assets_all = [] username = request.session.get('username') user = User.objects.get(username=username) for asset in user.assetsuser_set.all().order_by('ip'): - assets.append(asset.aid) + assets_all.append(asset.aid) else: - assets = Assets.objects.all().order_by('ip') + assets_all = Assets.objects.all().order_by('ip') + paginator = Paginator(assets_all, 20) + + try: + page = int(request.GET.get('page', 1)) + except ValueError: + page = 1 + + try: + assets = paginator.page(page) + except (EmptyPage, InvalidPage): + assets = paginator.page(paginator.num_pages) + if request.method == 'POST': if request.session.get('admin') < 2: return HttpResponseRedirect('/showAssets/') @@ -727,9 +751,21 @@ def addAssets(request): def showPerm(request): """查看权限""" if is_super_user(request): - users = User.objects.all() + users_all = User.objects.all() else: - users = group_member(request.session.get('username')) + users_all = group_member(request.session.get('username')) + + paginator = Paginator(users_all, 20) + + try: + page = int(request.GET.get('page', 1)) + except ValueError: + page = 1 + + try: + users = paginator.page(page) + except (EmptyPage, InvalidPage): + users = paginator.page(paginator.num_pages) if request.method == 'POST': assets_del = request.REQUEST.getlist('selected') diff --git a/webroot/AutoSa/templates/showAssets.html b/webroot/AutoSa/templates/showAssets.html index 92c120438..2064da62e 100644 --- a/webroot/AutoSa/templates/showAssets.html +++ b/webroot/AutoSa/templates/showAssets.html @@ -33,4 +33,19 @@ + {% endblock %} \ No newline at end of file