duoduo/CTFd-Whale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: duoduo:b460f145bea9bbbee80c806922f9b6d794a55d71
Branches Tags
duoduo:master duoduo:dev
..
compare: duoduo:master
Branches Tags
duoduo:master duoduo:dev

5 Commits
b460f145be ... master

Author SHA1 Message Date
Duoduo
fde7f08303 Common 2025-09-20 03:43:16 +08:00
Duoduo
4b8e48ac18 Common 2025-09-20 03:30:20 +08:00
Duoduo
ac0a7c6473 Common 2025-09-20 03:24:28 +08:00
Duoduo
55142ec793 Common 2025-09-20 03:22:26 +08:00
Duoduo
bda213bdd5 Common 2025-09-20 03:15:02 +08:00
3 changed files with 6 additions and 4 deletions
Expand all files Collapse all files

4
api.py
View File

@ -31,7 +31,7 @@ class AdminContainers(Resource):
@admins_only @admins_only
def get(): def get():
page = abs(request.args.get("page", 1, type=int)) 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_start = results_per_page * (page - 1)
page_end = results_per_page * (page - 1) + results_per_page page_end = results_per_page * (page - 1) + results_per_page
@ -50,7 +50,7 @@ class AdminContainers(Resource):
@admins_only @admins_only
def logs(): def logs():
page = abs(request.args.get("page", 1, type=int)) 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_start = results_per_page * (page - 1)
page_end = results_per_page * (page - 1) + results_per_page page_end = results_per_page * (page - 1) + results_per_page

4
templates/whale_containers.html
View File

@ -41,13 +41,13 @@
{% for page in range(range_l, range_r + 1) %} {% for page in range(range_l, range_r + 1) %}
<li class="page-item{{ ' active' if curr_page == page }}"> <li class="page-item{{ ' active' if curr_page == page }}">
<a class="page-link" <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> >{{ page }}</a>
</li> </li>
{% endfor %} {% endfor %}
<li class="page-item{{ ' disabled' if curr_page >= pages else '' }}"> <li class="page-item{{ ' disabled' if curr_page >= pages else '' }}">
<a class="page-link" aria-label="Next" <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 aria-hidden="true">&raquo;</span>
<span class="sr-only">Next</span> <span class="sr-only">Next</span>

2
utils/db.py
View File

@ -66,6 +66,7 @@ class DBContainer:
@staticmethod @staticmethod
def get_all_container_logs_page(page_start, page_end): def get_all_container_logs_page(page_start, page_end):
q = db.session.query(WhaleContainerLog) q = db.session.query(WhaleContainerLog)
q = q.order_by(WhaleContainerLog.id.desc())
q = q.slice(page_start, page_end) q = q.slice(page_start, page_end)
return q.all() return q.all()
@ -85,6 +86,7 @@ class DBContainer:
WhaleContainer.start_time >= WhaleContainer.start_time >=
datetime.datetime.now() - datetime.timedelta(seconds=timeout) datetime.datetime.now() - datetime.timedelta(seconds=timeout)
) )
q = q.order_by(WhaleContainer.id.desc())
q = q.slice(page_start, page_end) q = q.slice(page_start, page_end)
return q.all() return q.all()