deepcrayon
/
lila
1
0
Fork 0
Code Releases Activity

minor tweaks after #9743

hotfix-tablebase
Thibault Duplessis 2021-09-11 19:50:49 +02:00
parent 52ed076cff
commit c42d0898de
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/team/declinedRequest.scala
View File

@ -47,7 +47,7 @@ object declinedRequest {
name := "url",
value := routes.Team.declinedRequests(team.id, requests.currentPage)
),
button(name := "process", cls := "button button-green", value := "accept-declined")(
button(name := "process", cls := "button button-green", value := "accept")(
trans.accept()
)
)

2
app/views/team/show.scala
View File

@ -90,7 +90,7 @@ object show {
),
div(cls := "team-show__actions")(
(t.enabled && !info.mine) option frag(
if (info.myRequest.map(_.declined) | false)
if (info.myRequest.exists(_.declined))
frag(
strong(requestDeclined()),
a(cls := "button disabled button-metal")(joinTeam())

19
modules/team/src/main/TeamApi.scala
View File

@ -161,17 +161,16 @@ final class TeamApi(
}
def processRequest(team: Team, request: Request, decision: String): Funit = {
cached.nbRequests invalidate team.createdBy
if (decision == "decline")
requestRepo.coll.update.one($id(request.id), request.copy(declined = true)).void
else if (decision == "accept" | decision == "accept-declined")
for {
_ <- requestRepo.remove(request.id)
userOption <- userRepo byId request.user
_ <-
userOption.??(user => doJoin(team, user) >> notifier.acceptRequest(team, request))
} yield ()
if (decision == "decline") requestRepo.coll.updateField($id(request.id), "declined", true).void
else if (decision == "accept") for {
_ <- requestRepo.remove(request.id)
userOption <- userRepo byId request.user
_ <-
userOption.??(user => doJoin(team, user) >> notifier.acceptRequest(team, request))
} yield ()
else funit
} addEffect { _ =>
cached.nbRequests invalidate team.createdBy
}
def deleteRequestsByUserId(userId: User.ID) =