diff --git a/src/main/scala/gitbucket/core/controller/IndexController.scala b/src/main/scala/gitbucket/core/controller/IndexController.scala index cddd77a..7645996 100644 --- a/src/main/scala/gitbucket/core/controller/IndexController.scala +++ b/src/main/scala/gitbucket/core/controller/IndexController.scala @@ -213,8 +213,10 @@ } .map { t => Map( - "label" -> s"${avatar(t.userName, 16)}@${StringUtil.escapeHtml(t.userName)} ${StringUtil - .escapeHtml(t.fullName)}", + "label" -> s"${avatar(t.userName, 16)}@${StringUtil.escapeHtml( + StringUtil.cutTail(t.userName, 25, "...") + )} ${StringUtil + .escapeHtml(StringUtil.cutTail(t.fullName, 25, "..."))}", "value" -> t.userName ) } diff --git a/src/main/scala/gitbucket/core/controller/IssuesController.scala b/src/main/scala/gitbucket/core/controller/IssuesController.scala index 3b0ea78..1e19051 100644 --- a/src/main/scala/gitbucket/core/controller/IssuesController.scala +++ b/src/main/scala/gitbucket/core/controller/IssuesController.scala @@ -430,7 +430,8 @@ Map( "label" -> s"""${if (t.isPullRequest) "" else ""} #${StringUtil - .escapeHtml(t.issueId.toString)} ${StringUtil.escapeHtml(t.title)}""", + .escapeHtml(t.issueId.toString)} ${StringUtil + .escapeHtml(StringUtil.cutTail(t.title, 50, "..."))}""", "value" -> t.issueId.toString ) } diff --git a/src/main/scala/gitbucket/core/util/StringUtil.scala b/src/main/scala/gitbucket/core/util/StringUtil.scala index 9882f6b..1b57384 100644 --- a/src/main/scala/gitbucket/core/util/StringUtil.scala +++ b/src/main/scala/gitbucket/core/util/StringUtil.scala @@ -182,4 +182,11 @@ } } + def cutTail(txt: String, limit: Int, suffix: String = ""): String = { + txt.length match { + case x if x > limit => txt.substring(0, limit).concat(suffix) + case _ => txt + } + } + } diff --git a/src/main/scala/gitbucket/core/view/helpers.scala b/src/main/scala/gitbucket/core/view/helpers.scala index 11cff99..730b827 100644 --- a/src/main/scala/gitbucket/core/view/helpers.scala +++ b/src/main/scala/gitbucket/core/view/helpers.scala @@ -186,13 +186,6 @@ def link(value: String, repository: RepositoryService.RepositoryInfo)(implicit context: Context): Html = Html(decorateHtml(convertRefsLinks(value, repository), repository)) - def cut(value: String, length: Int): String = - if (value.length > length) { - value.substring(0, length) + "..." - } else { - value - } - import scala.util.matching.Regex._ implicit class RegexReplaceString(private val s: String) extends AnyVal { def replaceAll(pattern: String)(replacer: Match => String): String = {