use a distinct URL for pool reloading

pull/90/head
Thibault Duplessis 2014-06-28 12:04:24 +02:00
parent 525ce12ab5
commit 94c27bd7f0
4 changed files with 12 additions and 5 deletions

View File

@ -15,10 +15,7 @@ object Pool extends LilaController {
def show(id: String) = Open { implicit ctx =>
OptionFuOk(env.repo byId id) { pool =>
if (lila.common.HTTPRequest isXhr ctx.req) env.api.gamesOf(pool) map { games =>
html.pool.refresh(pool, games)
}
else env version id zip
env version id zip
chatOf(pool.setup) zip
env.api.gamesOf(pool) zip
pool.userCurrentPov(ctx.me).??(GameRepo.pov) map {
@ -27,6 +24,14 @@ object Pool extends LilaController {
}
}
def reload(id: String) = Open { implicit ctx =>
OptionFuOk(env.repo byId id) { pool =>
env.api.gamesOf(pool) map { games =>
html.pool.reload(pool, games)
}
}
}
def help(id: String) = Open { implicit ctx =>
OptionOk(fuccess(env.setups get id)) { setup =>
html.pool.help(setup)

View File

@ -39,7 +39,8 @@ underchat = underchat.some) {
<div id="pool"
data-id="@p.setup.id"
data-version="@version"
data-socket-url="@routes.Pool.websocket(p.setup.id)">
data-socket-url="@routes.Pool.websocket(p.setup.id)"
data-href="@routes.Pool.reload(p.setup.id)">
<div class="pool_side scroll-shadow">
<div class="pairings">
@p.pairings.take(50).map { pairing =>

View File

@ -9,6 +9,7 @@ GET /timeline/more controllers.Lobby.timelineMore
# Pool
GET /pool/:id controllers.Pool.show(id: String)
GET /pool/:id/reload controllers.Pool.reload(id: String)
GET /pool/:id/socket controllers.Pool.websocket(id: String)
POST /pool/:id/enter controllers.Pool.enter(id: String)
POST /pool/:id/leave controllers.Pool.leave(id: String)