Fix release activity link generation

This commit is contained in:
Ikebe Shodai
2019-02-04 23:19:28 +09:00
parent 9fbf67d451
commit c7fe828252
3 changed files with 11 additions and 7 deletions

View File

@@ -121,7 +121,7 @@ trait ReleaseControllerBase extends ControllerBase {
createReleaseAsset(repository.owner, repository.name, tagName, fileId, fileName, size, loginAccount)
}
recordReleaseActivity(repository.owner, repository.name, loginAccount.userName, form.name)
recordReleaseActivity(repository.owner, repository.name, loginAccount.userName, form.name, tagName)
redirect(s"/${repository.owner}/${repository.name}/releases/${tagName}")
})

View File

@@ -352,15 +352,19 @@ trait ActivityService {
currentDate
)
def recordReleaseActivity(userName: String, repositoryName: String, activityUserName: String, name: String)(
implicit s: Session
): Unit =
def recordReleaseActivity(
userName: String,
repositoryName: String,
activityUserName: String,
releaseName: String,
tagName: String
)(implicit s: Session): Unit =
Activities insert Activity(
userName,
repositoryName,
activityUserName,
"release",
s"[user:${activityUserName}] released [release:${userName}/${repositoryName}/${name}] at [repo:${userName}/${repositoryName}]",
s"[user:${activityUserName}] released [release:${userName}/${repositoryName}/${tagName}:${releaseName}] at [repo:${userName}/${repositoryName}]",
None,
currentDate
)

View File

@@ -235,10 +235,10 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache
.group(2)}@${m.group(3).substring(0, 7)}</a>"""
)
.replaceAll(
"\\[release:([^\\s]+?)/([^\\s]+?)/([^\\s]+?)\\]",
"\\[release:([^\\s]+?)/([^\\s]+?)/([^\\s]+?):(.+)\\]",
(m: Match) =>
s"""<a href="${context.path}/${m.group(1)}/${m.group(2)}/releases/${encodeRefName(m.group(3))}">${m
.group(3)}</a>"""
.group(4)}</a>"""
)
)