starnakin/42_ft_transcendence
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tournament: search: fix: tournament state is define

Browse Source
This commit is contained in:
starnakin 2024-03-11 13:48:54 +01:00 committed by AdrienLSH
parent d7a7a53a68
commit 6d942eea09
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
frontend/static/js/api/tournament/Tournaments.js
View File

@ -67,7 +67,8 @@ class Tourmanents
tournament_data.started, tournament_data.started,
tournament_data.finished, tournament_data.finished,
tournament_data.levels, tournament_data.levels,
tournament_data.id)); tournament_data.id,
tournament_data.state));
}); });
return tournaments; return tournaments;

4
frontend/static/js/index.js
View File

@ -15,7 +15,7 @@ import SettingsView from "./views/SettingsView.js";
import ProfilePageView from "./views/ProfilePageView.js"; import ProfilePageView from "./views/ProfilePageView.js";
import MatchMakingView from "./views/MatchMakingView.js"; import MatchMakingView from "./views/MatchMakingView.js";
import TournamentPageView from "./views/tournament/TournamentPageView.js"; import TournamentPageView from "./views/tournament/TournamentPageView.js";
import TournamentsView from "./views/tournament/TournamentsListView.js"; import TournamentsListView from "./views/tournament/TournamentsListView.js";
import TournamentCreateView from "./views/tournament/TournamentCreateView.js"; import TournamentCreateView from "./views/tournament/TournamentCreateView.js";
import AuthenticationView from "./views/accounts/AuthenticationView.js"; import AuthenticationView from "./views/accounts/AuthenticationView.js";
import TicTacToeView from "./views/TicTacToeView.js"; import TicTacToeView from "./views/TicTacToeView.js";
@ -82,7 +82,7 @@ const router = async(uri) => {
{ path: "/profiles/:username", view: ProfilePageView }, { path: "/profiles/:username", view: ProfilePageView },
{ path: "/tournaments/create", view: TournamentCreateView }, { path: "/tournaments/create", view: TournamentCreateView },
{ path: "/tournaments/:id", view: TournamentPageView }, { path: "/tournaments/:id", view: TournamentPageView },
{ path: "/tournaments/", view: TournamentsView }, { path: "/tournaments/", view: TournamentsListView },
{ path: "/login", view: AuthenticationView }, { path: "/login", view: AuthenticationView },
{ path: "/register", view: AuthenticationView }, { path: "/register", view: AuthenticationView },
{ path: "/logout", view: LogoutView }, { path: "/logout", view: LogoutView },

2
tournament/viewset.py
View File

@ -43,7 +43,7 @@ class TournamentViewSet(viewsets.ModelViewSet):
query = TournamentModel.objects.filter(started=False, finished=False) query = TournamentModel.objects.filter(started=False, finished=False)
case _: case _:
query = TournamentModel.objects.all() query = TournamentModel.objects.all()
serializer = TournamentSerializer(query, many=True) serializer = self.serializer_class(query, many=True)
return Response(serializer.data) return Response(serializer.data)
def retrieve(self, request: HttpRequest, pk): def retrieve(self, request: HttpRequest, pk):