Add icon for create tag activity.

This commit is contained in:
takezoe
2013-08-07 21:02:35 +09:00
parent e769460397
commit d2373a00ea
3 changed files with 15 additions and 14 deletions

View File

@@ -6,23 +6,23 @@ import Database.threadLocalSession
trait ActivityService { trait ActivityService {
def getActivitiesByUser(activityUserName: String, isPublic: Boolean): List[Activity] = { def getActivitiesByUser(activityUserName: String, isPublic: Boolean): List[Activity] =
val q = Query(Activities) Activities
.innerJoin(Repositories).on((t1, t2) => t1.byRepository(t2.userName, t2.repositoryName)) .innerJoin(Repositories).on((t1, t2) => t1.byRepository(t2.userName, t2.repositoryName))
.filter { case (t1, t2) =>
(if(isPublic){ if(isPublic){
q filter { case (t1, t2) => (t1.activityUserName is activityUserName.bind) && (t2.isPrivate is false.bind) } (t1.activityUserName is activityUserName.bind) && (t2.isPrivate is false.bind)
} else { } else {
q filter { case (t1, t2) => t1.activityUserName is activityUserName.bind } (t1.activityUserName is activityUserName.bind)
}) }
.sortBy { case (t1, t2) => t1.activityId desc } }
.map { case (t1, t2) => t1 } .sortBy { case (t1, t2) => t1.activityId desc }
.take(30) .map { case (t1, t2) => t1 }
.list .take(30)
} .list
def getRecentActivities(): List[Activity] = def getRecentActivities(): List[Activity] =
Query(Activities) Activities
.innerJoin(Repositories).on((t1, t2) => t1.byRepository(t2.userName, t2.repositoryName)) .innerJoin(Repositories).on((t1, t2) => t1.byRepository(t2.userName, t2.repositoryName))
.filter { case (t1, t2) => t2.isPrivate is false.bind } .filter { case (t1, t2) => t2.isPrivate is false.bind }
.sortBy { case (t1, t2) => t1.activityId desc } .sortBy { case (t1, t2) => t1.activityId desc }

View File

@@ -53,6 +53,7 @@
case "merge_pullreq" => longActivity(activity, "activity-merge.png") case "merge_pullreq" => longActivity(activity, "activity-merge.png")
case "create_repository" => shortActivity(activity, "activity-create-repository.png") case "create_repository" => shortActivity(activity, "activity-create-repository.png")
case "create_branch" => shortActivity(activity, "activity-branch.png") case "create_branch" => shortActivity(activity, "activity-branch.png")
case "create_tag" => shortActivity(activity, "activity-tag.png")
case "fork" => shortActivity(activity, "activity-fork.png") case "fork" => shortActivity(activity, "activity-fork.png")
case "push" => customActivity(activity, "activity-commit.png"){ case "push" => customActivity(activity, "activity-commit.png"){
<div class="small activity-message"> <div class="small activity-message">

Binary file not shown.

After

Width:  |  Height:  |  Size: 301 B