Fix challenge filter in /api/v1/statistics/challenges/solves (#1529)

* Fix showing hidden challenge solve count in admin statistics page
This commit is contained in:
Koki Takahashi
2020-07-07 05:26:00 +09:00
committed by GitHub
parent 7dcfba40b3
commit 1bccbf1fdd

View File

@@ -1,6 +1,6 @@
from flask_restx import Resource from flask_restx import Resource
from sqlalchemy import func from sqlalchemy import func
from sqlalchemy.sql import or_ from sqlalchemy.sql import and_
from CTFd.api.v1.statistics import statistics_namespace from CTFd.api.v1.statistics import statistics_namespace
from CTFd.models import Challenges, Solves, db from CTFd.models import Challenges, Solves, db
@@ -31,7 +31,7 @@ class ChallengeSolveStatistics(Resource):
def get(self): def get(self):
chals = ( chals = (
Challenges.query.filter( Challenges.query.filter(
or_(Challenges.state != "hidden", Challenges.state != "locked") and_(Challenges.state != "hidden", Challenges.state != "locked")
) )
.order_by(Challenges.value) .order_by(Challenges.value)
.all() .all()