deepcrayon
/
lila
1
0
Fork 0
Code Releases Activity

fix wiki query

pull/83/head
Thibault Duplessis 2013-05-04 16:57:44 -03:00
parent bc70c45c4e
commit 0b5ffac198
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/wiki/src/main/Api.scala
View File

@ -15,16 +15,15 @@ private[wiki] final class Api {
$find.one(Json.obj("slug" -> slug, "lang" -> DefaultLang)) map {
case (a, b) ⇒ a orElse b
}
pages ← $find($query($or(Json.obj(
"lang" -> lang,
"lang" -> DefaultLang
))).sort($sort asc "number"))
pages ← $find($query(Json.obj(
"lang" -> $in(lang, DefaultLang)
)).sort($sort asc "number"))
} yield page map { _ -> makeMenu(pages) }
private def makeMenu(pages: List[Page]): List[Page] = {
val (defaultPages, langPages) = pages partition (_.isDefaultLang)
defaultPages map { dPage ⇒
langPages find (_.number == dPage.number) getOrElse dPage
langPages.find(_.number == dPage.number) | dPage
}
}
}