Common

api.py

@@ -31,7 +31,7 @@ class AdminContainers(Resource):
     @admins_only
     def get():
         page = abs(request.args.get("page", 1, type=int))
-        results_per_page = abs(request.args.get("per_page", 20, type=int))
+        results_per_page = abs(request.args.get("per_page", 10, type=int))
         page_start = results_per_page * (page - 1)
         page_end = results_per_page * (page - 1) + results_per_page
 
@@ -50,7 +50,7 @@ class AdminContainers(Resource):
     @admins_only
     def logs():
         page = abs(request.args.get("page", 1, type=int))
-        results_per_page = abs(request.args.get("per_page", 20, type=int))
+        results_per_page = abs(request.args.get("per_page", 10, type=int))
         page_start = results_per_page * (page - 1)
         page_end = results_per_page * (page - 1) + results_per_page
 

templates/whale_containers.html

@@ -41,13 +41,13 @@
             {% for page in range(range_l, range_r + 1) %}
                 <li class="page-item{{ ' active' if curr_page == page }}">
                     <a class="page-link"
-                       href="/plugins/ctfd-whale/admin/containers?page={{ page }}&type={{ request.args.get('type', 'instances') }}"
+                       href="/plugins/ctfd-whale/admin/containers?page={{ page }}&type={{ session.get('page_type', 'containers') }}"
                     >{{ page }}</a>
                 </li>
             {% endfor %}
             <li class="page-item{{ ' disabled' if curr_page >= pages else '' }}">
                 <a class="page-link" aria-label="Next"
-                   href="/plugins/ctfd-whale/admin/containers?page={{ curr_page + 1 }}&type={{ request.args.get('type', 'instances') }}"
+                   href="/plugins/ctfd-whale/admin/containers?page={{ curr_page + 1 }}&type={{ session.get('page_type', 'containers') }}"
                 >
                     <span aria-hidden="true">&raquo;</span>
                     <span class="sr-only">Next</span>

utils/db.py

@@ -66,6 +66,7 @@ class DBContainer:
     @staticmethod
     def get_all_container_logs_page(page_start, page_end):
         q = db.session.query(WhaleContainerLog)
+        q = q.order_by(WhaleContainerLog.id.desc())
         q = q.slice(page_start, page_end)
 
         return q.all()