From b44c1e45798d2ef71d2ebd4d3e1bfa43295d72b9 Mon Sep 17 00:00:00 2001
From: jysperm <jysperm@gmail.com>
Date: Sun, 27 Apr 2014 01:26:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=20Ticket=20=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=8A=A0=E4=B8=8A=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/api/ticket.coffee        | 12 ++++++++++--
 core/model/account.coffee     |  2 +-
 core/static/style/ticket.less | 13 +++++++++++++
 core/view/ticket/view.jade    |  7 +++++--
 4 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/core/api/ticket.coffee b/core/api/ticket.coffee
index a02fb86..4644a08 100644
--- a/core/api/ticket.coffee
+++ b/core/api/ticket.coffee
@@ -30,8 +30,16 @@ module.exports =
           unless mTicket.getMember ticket, account
             return res.send 403
 
-        renderer 'ticket/view',
-          ticket: ticket
+        async.map ticket.replys, (reply, callback) ->
+          mAccount.findId reply.account_id, (reply_account) ->
+            reply.account = reply_account
+            callback null, reply
+
+        , (err, result) ->
+          ticket.replys = result
+
+          renderer 'ticket/view',
+            ticket: ticket
 
   post:
     create: (req, res) ->
diff --git a/core/model/account.coffee b/core/model/account.coffee
index 422f03f..4b9fb8d 100644
--- a/core/model/account.coffee
+++ b/core/model/account.coffee
@@ -23,7 +23,7 @@ exports.register = (username, email, passwd, callback = null) ->
     signup: new Date()
     group: []
     setting:
-      avatar_url: crypto.createHash('md5').update(email).digest('hex')
+      avatar_url: "//ruby-china.org/avatar/#{crypto.createHash('md5').update(email).digest('hex')}?s=58"
     attribure:
       plans: []
     tokens: []
diff --git a/core/static/style/ticket.less b/core/static/style/ticket.less
index 4fbb0cb..95ebb4d 100644
--- a/core/static/style/ticket.less
+++ b/core/static/style/ticket.less
@@ -5,3 +5,16 @@
 .list-group-item a {
   margin-right: 10px;
 }
+
+.list-group-item img {
+  width: 58px;
+  height: 58px;
+}
+
+.list-content {
+  margin-left: 68px;
+}
+
+.label {
+  margin-right: 5px;
+}
diff --git a/core/view/ticket/view.jade b/core/view/ticket/view.jade
index 37f1015..e95d498 100644
--- a/core/view/ticket/view.jade
+++ b/core/view/ticket/view.jade
@@ -14,10 +14,13 @@ block main
     ul.list-group
       for reply in ticket.replys
         li.list-group-item.clearfix
-          a.pull-left(href='/member/')
-            img(src='http://ruby-china.org/avatar/efcc15b92617a95a09f514a9bff9e6c3?s=58')
+          a.pull-left
+            img(src= reply.account.setting.avatar_url)
           .list-content
             p!= reply.content_html
+            p
+              span.label.label-info= reply.account.username
+              span.label.label-default= reply.created_at
 
   .row
     header= t('ticket.create_reply')