deepcrayon/lila
deepcrayon/lila
1
0
Fork 0
Code Releases Activity

don't always load tournament to generate sides

Browse source
This commit is contained in:
Thibault Duplessis 2015-06-07 03:51:53 +02:00
parent d53dbac909
commit 5112bdd6cb
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/Round.scala
View file

@ -211,12 +211,12 @@ object Round extends LilaController with TheftPrevention {
}
private def sides(pov: Pov, isPlayer: Boolean)(implicit ctx: Context) =
(pov.game.tournamentId ?? TournamentRepo.byId) zip
myTour(pov.game.simulId) zip
(pov.game.simulId ?? Env.simul.repo.find) zip
GameRepo.initialFen(pov.game) zip
Env.game.crosstableApi(pov.game) map {
case (((tour, simul), initialFen), crosstable) =>
Ok(html.game.sides(pov, initialFen, tour, crosstable, withTourStanding = isPlayer, simul))
case (((myTour, simul), initialFen), crosstable) =>
Ok(html.game.sides(pov, initialFen, myTour, crosstable, withTourStanding = isPlayer, simul))
}
def continue(id: String, mode: String) = Open { implicit ctx =>

4
app/views/game/sides.scala.html
View file

@ -1,7 +1,7 @@
@(pov: Pov, initialFen: Option[String], tour: Option[lila.tournament.Tournament], cross: Option[lila.game.Crosstable], withTourStanding: Boolean, simul: Option[lila.simul.Simul], userTv: Option[User] = None)(implicit ctx: Context)
@(pov: Pov, initialFen: Option[String], myTour: Option[lila.tournament.Tournament], cross: Option[lila.game.Crosstable], withTourStanding: Boolean, simul: Option[lila.simul.Simul], userTv: Option[User] = None)(implicit ctx: Context)
<div class="sides">
@side(pov, initialFen, tour, withTourStanding, simul, userTv)
@side(pov, initialFen, myTour, withTourStanding, simul, userTv)
@cross.map { c =>
<div class="crosstable">
@crosstable(c, pov.gameId.some)