From d2373a00ea76b258037b9f104e9bd302f385fe17 Mon Sep 17 00:00:00 2001
From: takezoe <takezoe@gmail.com>
Date: Wed, 7 Aug 2013 21:02:35 +0900
Subject: [PATCH] Add icon for create tag activity.

---
 src/main/scala/service/ActivityService.scala  |  28 +++++++++---------
 src/main/twirl/helper/activities.scala.html   |   1 +
 .../assets/common/images/actrivity-tag.png    | Bin 0 -> 301 bytes
 3 files changed, 15 insertions(+), 14 deletions(-)
 create mode 100644 src/main/webapp/assets/common/images/actrivity-tag.png

diff --git a/src/main/scala/service/ActivityService.scala b/src/main/scala/service/ActivityService.scala
index 1fc61e4de..0e5dbba9a 100644
--- a/src/main/scala/service/ActivityService.scala
+++ b/src/main/scala/service/ActivityService.scala
@@ -6,23 +6,23 @@ import Database.threadLocalSession
 
 trait ActivityService {
 
-  def getActivitiesByUser(activityUserName: String, isPublic: Boolean): List[Activity] = {
-    val q = Query(Activities)
+  def getActivitiesByUser(activityUserName: String, isPublic: Boolean): List[Activity] =
+    Activities
       .innerJoin(Repositories).on((t1, t2) => t1.byRepository(t2.userName, t2.repositoryName))
+      .filter { case (t1, t2) =>
+        if(isPublic){
+          (t1.activityUserName is activityUserName.bind) && (t2.isPrivate is false.bind)
+        } else {
+          (t1.activityUserName is activityUserName.bind)
+        }
+      }
+      .sortBy { case (t1, t2) => t1.activityId desc }
+      .map    { case (t1, t2) => t1 }
+      .take(30)
+      .list
 
-    (if(isPublic){
-      q filter { case (t1, t2) => (t1.activityUserName is activityUserName.bind) && (t2.isPrivate is false.bind) }
-    } else {
-      q filter { case (t1, t2) => t1.activityUserName is activityUserName.bind }
-    })
-    .sortBy { case (t1, t2) => t1.activityId desc }
-    .map    { case (t1, t2) => t1 }
-    .take(30)
-    .list
-  }
-  
   def getRecentActivities(): List[Activity] =
-    Query(Activities)
+    Activities
       .innerJoin(Repositories).on((t1, t2) => t1.byRepository(t2.userName, t2.repositoryName))
       .filter { case (t1, t2) => t2.isPrivate is false.bind }
       .sortBy { case (t1, t2) => t1.activityId desc }
diff --git a/src/main/twirl/helper/activities.scala.html b/src/main/twirl/helper/activities.scala.html
index e301980dc..7325f4288 100644
--- a/src/main/twirl/helper/activities.scala.html
+++ b/src/main/twirl/helper/activities.scala.html
@@ -53,6 +53,7 @@
         case "merge_pullreq"     => longActivity(activity, "activity-merge.png")
         case "create_repository" => shortActivity(activity, "activity-create-repository.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 "push"  => customActivity(activity, "activity-commit.png"){
           <div class="small activity-message">
diff --git a/src/main/webapp/assets/common/images/actrivity-tag.png b/src/main/webapp/assets/common/images/actrivity-tag.png
new file mode 100644
index 0000000000000000000000000000000000000000..0fea83e87a40979da62f6c4cc10c7a2456f09c8b
GIT binary patch
literal 301
zcmV+|0n+}7P)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM0002=Nkl<ZD9@FV
z%ML_95Jmm}@6aqH79v4n#}Z>lEW|SrubHbWX&N)h+(c95o_e6X|CBOKQyj-hlB8++
z;>xlNNxZ{Jc?szIUX`WmdJqKbx^`Vhp#)GCGELL>eNEGFF3U0uLs^!{GsXrkl-Pl`
zZ7DmBBVvpPAkTC4rlx6j05|G8&og2y0H7!e#zj_oM(G`>>zcB*ZHHlK7>4J07zsSp
zf_3FOmKK%HvMft14L5za9l%8c+<|S|&<EY%b{vNog*a?^XV^&yqbNFnZ+(PZ*F`G{
z_`wMG6?kOM?g!w)T-?uqVD9d(08~{K{rihPWEz}zp^sZ`00000NkvXXu0mjfk(hlQ

literal 0
HcmV?d00001