diff --git a/src/main/scala/view/helpers.scala b/src/main/scala/view/helpers.scala index 86aef26..6613a5f 100644 --- a/src/main/scala/view/helpers.scala +++ b/src/main/scala/view/helpers.scala @@ -51,6 +51,13 @@ def link(value: String, repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context): Html = Html(convertRefsLinks(value, repository)) + def cut(value: String, length: Int): String = + if(value.length > length){ + value.substring(0, length) + "..." + } else { + value + } + def activityMessage(message: String)(implicit context: app.Context): Html = Html(message .replaceAll("\\[issue:([^\\s]+?)/([^\\s]+?)#((\\d+))\\]" , s"""$$1/$$2#$$3""") diff --git a/src/main/twirl/issues/listparts.scala.html b/src/main/twirl/issues/listparts.scala.html index ac698fa..7978680 100644 --- a/src/main/twirl/issues/listparts.scala.html +++ b/src/main/twirl/issues/listparts.scala.html @@ -149,8 +149,10 @@ @issue.repositoryName ・ } @if(issue.isPullRequest){ + @issue.title } else { + @issue.title } @labels.map { label => @@ -162,7 +164,7 @@ } #@issue.issueId -
+
Opened by @issue.openedUserName @datetime(issue.registeredDate)  @if(commentCount > 0){ @commentCount @plural(commentCount, "comment") diff --git a/src/main/twirl/pulls/list.scala.html b/src/main/twirl/pulls/list.scala.html index 205aedc..ac077c3 100644 --- a/src/main/twirl/pulls/list.scala.html +++ b/src/main/twirl/pulls/list.scala.html @@ -32,6 +32,7 @@
@if(hasWritePermission){
+ @helper.html.paginator(page, (if(condition.state == "open") openCount else closedCount), service.IssuesService.IssueLimit, 7, condition.toURL) New pull request
} @@ -96,29 +97,22 @@ @issues.map { case (issue, labels, commentCount) => - @if(hasWritePermission){ -