mirror of
https://github.com/gitbucket/gitbucket.git
synced 2025-11-07 14:05:52 +01:00
Add icon for create tag activity.
This commit is contained in:
@@ -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 }
|
.sortBy { case (t1, t2) => t1.activityId desc }
|
||||||
.map { case (t1, t2) => t1 }
|
.map { case (t1, t2) => t1 }
|
||||||
.take(30)
|
.take(30)
|
||||||
.list
|
.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 }
|
||||||
|
|||||||
@@ -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">
|
||||||
|
|||||||
BIN
src/main/webapp/assets/common/images/actrivity-tag.png
Normal file
BIN
src/main/webapp/assets/common/images/actrivity-tag.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 301 B |
Reference in New Issue
Block a user