JohnHammond
/
CTFd
mirror of https://github.com/JohnHammond/CTFd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into add-sqlalchemy-engine-options

mark-2.4.1
Kevin Chung 2020-05-05 19:28:02 -04:00 committed by GitHub
parent 565b218ebc 287cb2f263
commit 4b54789c14
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.dockerignore
View File

@ -12,3 +12,4 @@ CTFd/uploads/**/*
.gitignore .gitignore
.prettierignore .prettierignore
.travis.yml .travis.yml
node_modules

10
CTFd/admin/submissions.py
View File

@ -54,10 +54,16 @@ def submissions_listing(submission_type):
"admin/submissions.html", "admin/submissions.html",
submissions=submissions, submissions=submissions,
prev_page=url_for( prev_page=url_for(
request.endpoint, type=submission_type, page=submissions.prev_num, **args request.endpoint,
submission_type=submission_type,
page=submissions.prev_num,
**args
), ),
next_page=url_for( next_page=url_for(
request.endpoint, type=submission_type, page=submissions.next_num, **args request.endpoint,
submission_type=submission_type,
page=submissions.next_num,
**args
), ),
type=submission_type, type=submission_type,
q=q, q=q,