Skip to content

Commit

Permalink
Merge pull request #132 from MAIF/issue-128
Browse files Browse the repository at this point in the history
Current izanami version
  • Loading branch information
larousso authored Jul 11, 2018
2 parents ed3e400 + 425dddd commit f0c2c66
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
7 changes: 5 additions & 2 deletions izanami-server/app/controllers/HomeController.scala
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,23 @@ class HomeController(_env: Env, AuthAction: ActionBuilder[AuthContext, AnyConten
s"$baseURL${_env.izanamiConfig.logout.url}"
}

val p = getClass.getPackage
val version = p.getImplementationVersion

def index() = AuthAction { ctx =>
ctx.auth match {
case Some(_) =>
Ok(
views.html
.index(_env, baseURL, logout, enabledUserManagement, toJson(ctx.auth))
.index(_env, baseURL, logout, enabledUserManagement, toJson(ctx.auth), version)
)
case None =>
Redirect(s"$baseURL/login")
}
}

def login() = AuthAction { ctx =>
Ok(views.html.index(_env, baseURL, logout, enabledUserManagement, toJson(ctx.auth)))
Ok(views.html.index(_env, baseURL, logout, enabledUserManagement, toJson(ctx.auth), version))
}

def otherRoutes(anyPath: String) = index()
Expand Down
3 changes: 2 additions & 1 deletion izanami-server/app/views/index.scala.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import play.api.libs.json.{JsValue, Json}

@(_env: env.Env, baseURL: String, logout: String, enabledUserManagement: Boolean, user: JsValue)
@(_env: env.Env, baseURL: String, logout: String, enabledUserManagement: Boolean, user: JsValue, version: String)

<!DOCTYPE html>
<html>
Expand All @@ -27,5 +27,6 @@
window.__contextPath = '@baseURL';
Izanami.init(document.getElementById("app"), '@logout', @enabledUserManagement, JSON.parse('@Html(Json.stringify(user))'));
</script>
Version: @version
</body>
</html>

0 comments on commit f0c2c66

Please sign in to comment.