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

Ignore error in activity timeline caused by invalid data.

Browse Source
This commit is contained in:
takezoe
2013-07-19 14:11:13 +09:00
parent fb921e951e
commit 3546a5d392
1 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/main/twirl/helper/activities.scala.html
View File

@@ -12,31 +12,33 @@
@activityMessage(activity.message) @activityMessage(activity.message)
</div> </div>
@activity.additionalInfo.map { additionalInfo => @activity.additionalInfo.map { additionalInfo =>
@(activity.activityType match { @if(additionalInfo.nonEmpty){
case "create_wiki" => { @(activity.activityType match {
<div class="small activity-message">Created <a href={s"${path}/${activity.userName}/${activity.repositoryName}/wiki/${additionalInfo}"}>{additionalInfo}</a>.</div> case "create_wiki" => {
} <div class="small activity-message">Created <a href={s"${path}/${activity.userName}/${activity.repositoryName}/wiki/${additionalInfo}"}>{additionalInfo}</a>.</div>
case "edit_wiki" => { }
<div class="small activity-message">Edited <a href={s"${path}/${activity.userName}/${activity.repositoryName}/wiki/${additionalInfo}"}>{additionalInfo}</a>.</div> case "edit_wiki" => {
} <div class="small activity-message">Edited <a href={s"${path}/${activity.userName}/${activity.repositoryName}/wiki/${additionalInfo}"}>{additionalInfo}</a>.</div>
case "push" => { }
<div class="small activity-message"> case "push" => {
{additionalInfo.split("\n").reverse.take(4).zipWithIndex.map{ case (commit, i) => <div class="small activity-message">
if(i == 3){ {additionalInfo.split("\n").reverse.take(4).zipWithIndex.map{ case (commit, i) =>
<div>...</div> if(i == 3){
} else { <div>...</div>
<div> } else {
<a href={s"${path}/${activity.userName}/${activity.repositoryName}/commit/${commit.substring(0, 40)}"} class="monospace">{commit.substring(0, 7)}</a> <div>
<span>{commit.substring(41)}</span> <a href={s"${path}/${activity.userName}/${activity.repositoryName}/commit/${commit.substring(0, 40)}"} class="monospace">{commit.substring(0, 7)}</a>
</div> <span>{commit.substring(41)}</span>
} </div>
}} }
</div> }}
} </div>
case _ => { }
<div class=" activity-message">{additionalInfo}</div> case _ => {
} <div class=" activity-message">{additionalInfo}</div>
}) }
})
}
} }
</div> </div>
} }