From 8b33eaf25e79e02abdb1482c9e871ae86d1f3bcb Mon Sep 17 00:00:00 2001 From: Thibault Duplessis Date: Tue, 24 Jan 2017 14:23:51 +0100 Subject: [PATCH] fix mobile app empty user perfs - closes #2563 --- modules/user/src/main/JsonView.scala | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/user/src/main/JsonView.scala b/modules/user/src/main/JsonView.scala index 01f96d1023..be8fe2c827 100644 --- a/modules/user/src/main/JsonView.scala +++ b/modules/user/src/main/JsonView.scala @@ -86,9 +86,14 @@ object JsonView { "prog" -> o.progress) } + private val standardPerfKeys = PerfType.standard.map(_.key).toSet + + private def select(key: String, perf: Perf) = + perf.nb > 0 || standardPerfKeys(key) + def perfs(u: User, onlyPerf: Option[PerfType] = None) = JsObject(u.perfs.perfsMap collect { - case (key, perf) if perf.nb > 0 && onlyPerf.fold(true)(_.key == key) => + case (key, perf) if onlyPerf.fold(select(key, perf))(_.key == key) => key -> perfWrites.writes(perf) })