From bc8f638f3cb4c2b308b1b39eed8fb61b7627e1ac Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Wed, 19 Jul 2017 16:21:30 +0800
Subject: [PATCH] feat(forums): load search result topic content data

---
 modules/forums/client/less/forum.less         | 16 +++++++++++
 .../views/search-result.client.view.html      | 27 +++++++++++++++++++
 .../controllers/forums.server.controller.js   |  3 ++-
 3 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/modules/forums/client/less/forum.less b/modules/forums/client/less/forum.less
index c56f892e..05a12d2f 100644
--- a/modules/forums/client/less/forum.less
+++ b/modules/forums/client/less/forum.less
@@ -653,9 +653,25 @@ em {
         margin: 15px 15px;
         .item-title {
             font-size: 16px;
+            font-weight: 500;
         }
         .item-forum-name {
             color: #999;
         }
+        .item-content {
+            color: #666;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            display: -webkit-box;
+            line-height: 20px;     /* fallback */
+            max-height: 40px;      /* fallback */
+            -webkit-line-clamp: 2; /* number of lines to show */
+            -webkit-box-orient: vertical;
+        }
+        .topic-by {
+            color: #999;
+            font-size: 12px;
+            margin-top: 3px;
+        }
     }
 }
diff --git a/modules/forums/client/views/search-result.client.view.html b/modules/forums/client/views/search-result.client.view.html
index fcd9ff08..93cf225b 100644
--- a/modules/forums/client/views/search-result.client.view.html
+++ b/modules/forums/client/views/search-result.client.view.html
@@ -11,6 +11,33 @@
                         <a class="item-title" ui-sref="forums.topic({ forumId: r.forum._id, topicId: r._id })">{{r.title}}</a>
                         <span> - </span>
                         <span class="item-forum-name">{{r.forum.category}} > {{r.forum.name}}</span>
+
+                        <div class="item-content">{{r.content}}</div>
+
+                        <div class="topic-by">
+                            <span>   <!--post-->
+                                <span class="small">
+                                    <span translate="FORUMS.FIELDS.REPLY_BY_1"></span>
+                                    <span user-info="r.user" info-name></span>
+                                    <span message-to="r.user" to-class="message-to-icon"></span>
+                                </span>
+                                <span class="small"
+                                      translate="FORUMS.FIELDS.REPLY_BY_3"
+                                      translate-values="{createdAt: '{{r.createdAt | date: 'yyyy-MM-dd HH:mm:ss'}}'}">
+                                </span>
+                            </span>
+                            <span class="by-reply" ng-if="r._replies.length > 0">   <!--reply-->
+                                <span class="small">
+                                    <span>, </span>
+                                    <span user-info="r.lastUser" info-name></span>
+                                    <span message-to="r.lastUser" to-class="message-to-icon"></span>
+                                </span>
+                                <span class="small"
+                                     translate="FORUMS.FIELDS.REPLY_BY_2"
+                                     translate-values="{createdAt: '{{r.lastReplyAt | date: 'yyyy-MM-dd HH:mm:ss'}}'}">
+                                </span>
+                            </span>
+                        </div>
                     </div>
                 </div>
 
diff --git a/modules/forums/server/controllers/forums.server.controller.js b/modules/forums/server/controllers/forums.server.controller.js
index 6e60eaf7..c2a5a3af 100644
--- a/modules/forums/server/controllers/forums.server.controller.js
+++ b/modules/forums/server/controllers/forums.server.controller.js
@@ -154,8 +154,9 @@ exports.forumsSearch = function (req, res) {
   }
 
   if (req.body.forumId) {
-    condition.forum = req.body.forumId
+    condition.forum = req.body.forumId;
   }
+
   if (keysA.length > 0) {
     condition.$or = [
       {title: {'$all': keysA}},