1. 支持绝对路径

2. 支持分页

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'
 

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')

webroot/AutoSa/templates/showAssets.html

@@ -33,4 +33,19 @@
         </table>
         <button class="btn btn-primary">删除</button></td>
     </form>
+       <nav>
+          <ul class="pager">
+            {% if assets.has_previous %}
+            <li><a href="?page={{ assets.previous_page_number }}">上一页</a></li>
+            {% endif %}
+
+            <span class="current">
+             Page {{ assets.number }} of {{ assets.paginator.num_pages }}.
+            </span>
+
+            {% if assets.has_next %}
+            <li><a href="?page={{ assets.next_page_number }}">下一页</a></li>
+            {% endif %}
+          </ul>
+        </nav>
 {% endblock %}