From 4d4a13bd88204531048f1f19920de3d2a5299ca9 Mon Sep 17 00:00:00 2001 From: Michael Hiiva Date: Mon, 15 Jul 2019 14:18:53 -0700 Subject: [PATCH] Added game_table2 to tournamet_detail. --- agagd/agagd_core/tables.py | 5 ----- agagd/agagd_core/views/core.py | 8 ++++---- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/agagd/agagd_core/tables.py b/agagd/agagd_core/tables.py index 7b4d9c7a..dd9fb0c2 100644 --- a/agagd/agagd_core/tables.py +++ b/agagd/agagd_core/tables.py @@ -46,11 +46,6 @@ class GameTable2(tables.Table): 'agagd_core.views.member_detail', verbose_name="black player", kwargs={"member_id":tables.A('pin_player_2.member_id')}) - tournament_code = tables.LinkColumn( - verbose_name="Tournament", - viewname='agagd_core.views.tournament_detail', - kwargs={'tourn_code':tables.A('tournament_code.tournament_code')},) - class Meta: model = Game # add class="paleblue" to tag diff --git a/agagd/agagd_core/views/core.py b/agagd/agagd_core/views/core.py index 8ddc5501..aa6759c6 100644 --- a/agagd/agagd_core/views/core.py +++ b/agagd/agagd_core/views/core.py @@ -1,6 +1,6 @@ from agagd_core.json_response import JsonResponse from agagd_core.models import Game, Member, Tournament, Chapters, Country -from agagd_core.tables import GameTable, MemberTable, TournamentTable, OpponentTable, TournamentPlayedTable +from agagd_core.tables import GameTable, GameTable2, MemberTable, TournamentTable, OpponentTable, TournamentPlayedTable from datetime import datetime, timedelta, date from django.core import exceptions from django.core.urlresolvers import reverse @@ -163,11 +163,11 @@ def member_vs(request, member_id, other_id): def tournament_detail(request, tourn_code): tourney = Tournament.objects.get(pk=tourn_code) - game_table = GameTable(tourney.games_in_tourney.all()) - RequestConfig(request, paginate={'per_page': 20}).configure(game_table) + game_table2 = GameTable2(tourney.games_in_tourney.all()) + RequestConfig(request, paginate={'per_page': 20}).configure(game_table2) return render(request, 'agagd_core/tourney.html', { - 'game_table': game_table, + 'game_table2': game_table2, 'tournament': tourney, })