Skip to content

Commit f188481

Browse files
committed
(refs #12)Add additional message at the header of forked gist
1 parent bce383b commit f188481

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

src/main/scala/gitbucket/gist/controller/GistController.scala

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -316,17 +316,15 @@ trait GistControllerBase extends ControllerBase {
316316
val userName = params("userName")
317317
val repoName = params("repoName")
318318

319-
val gist = getGist(userName, repoName).get
320-
val originUserName = gist.originUserName.getOrElse(userName)
321-
val originRepoName = gist.originRepositoryName.getOrElse(repoName)
322-
323-
html.forks(
324-
gist,
325-
getForkedCount(originUserName, originRepoName),
326-
GistRepositoryURL(gist, baseUrl, context.settings),
327-
getForkedGists(originUserName, originRepoName),
328-
isEditable(userName)
329-
)
319+
getGist(userName, repoName).map { gist =>
320+
html.forks(
321+
gist,
322+
getForkedCount(userName, repoName),
323+
GistRepositoryURL(gist, baseUrl, context.settings),
324+
getForkedGists(userName, repoName),
325+
isEditable(userName)
326+
)
327+
} getOrElse NotFound
330328
}
331329

332330
private def _gist(userName: String, repoName: Option[String] = None, revision: String = "master") = {

src/main/twirl/gitbucket/gist/header.scala.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@
3434
</div>
3535
<div class="muted" style="margin-top: -10px; margin-left: 30px;">
3636
Created at @gist.registeredDate
37+
@if(gist.originUserName.isDefined){
38+
- forked from <a href="@path/gist/@gist.originUserName/@gist.originRepositoryName">@gist.originUserName/@gist.originRepositoryName</a>
39+
}
3740
</div>
3841
</div>
3942
<hr style="margin-bottom: 20px;"/>

0 commit comments

Comments
 (0)