Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-06 13:35:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade scalatra-forms to 0.2.0 to solve performance issue

Browse Source
This commit is contained in:
Naoki Takezoe
2015-11-18 01:48:40 +09:00
parent abfc6eea1e
commit 446a524b5a
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
project/build.scala
View File

@@ -49,7 +49,7 @@ object MyBuild extends Build {
"org.scalatra" %% "scalatra-specs2" % ScalatraVersion % "test", "org.scalatra" %% "scalatra-specs2" % ScalatraVersion % "test",
"org.scalatra" %% "scalatra-json" % ScalatraVersion, "org.scalatra" %% "scalatra-json" % ScalatraVersion,
"org.json4s" %% "json4s-jackson" % "3.2.11", "org.json4s" %% "json4s-jackson" % "3.2.11",
"jp.sf.amateras" %% "scalatra-forms" % "0.1.0", "jp.sf.amateras" %% "scalatra-forms" % "0.2.0",
"commons-io" % "commons-io" % "2.4", "commons-io" % "commons-io" % "2.4",
"io.github.gitbucket" % "markedj" % "1.0.5-SNAPSHOT", "io.github.gitbucket" % "markedj" % "1.0.5-SNAPSHOT",
"org.apache.commons" % "commons-compress" % "1.9", "org.apache.commons" % "commons-compress" % "1.9",

3
src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala
View File

@@ -300,9 +300,8 @@ trait RepositorySettingsControllerBase extends ControllerBase {
private def webhookEvents = new ValueType[Set[WebHook.Event]]{ private def webhookEvents = new ValueType[Set[WebHook.Event]]{
def convert(name: String, params: Map[String, String], messages: Messages): Set[WebHook.Event] = { def convert(name: String, params: Map[String, String], messages: Messages): Set[WebHook.Event] = {
val map = params.toSeq.toMap // TODO This transformation will be unnecessary after upgrading to scalatra 2.4 and scalatra-forms 0.2
WebHook.Event.values.flatMap { t => WebHook.Event.values.flatMap { t =>
map.get(name + "." + t.name).map(_ => t) params.get(name + "." + t.name).map(_ => t)
}.toSet }.toSet
} }
def validate(name: String, params: Map[String, String], messages: Messages): Seq[(String, String)] = if(convert(name,params,messages).isEmpty){ def validate(name: String, params: Map[String, String], messages: Messages): Seq[(String, String)] = if(convert(name,params,messages).isEmpty){