From 7a25581a8ad9f09e013f6aef247f40ed453eb74f Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.be>
Date: Wed, 2 Jul 2014 10:49:55 +0200
Subject: [PATCH] Improved search template rendering.

---
 app/coffee/modules/search.coffee              |  4 +-
 .../views/modules/search-result-table.jade    | 63 +++++++++++--------
 2 files changed, 38 insertions(+), 29 deletions(-)

diff --git a/app/coffee/modules/search.coffee b/app/coffee/modules/search.coffee
index a51e600b..3322c414 100644
--- a/app/coffee/modules/search.coffee
+++ b/app/coffee/modules/search.coffee
@@ -128,7 +128,7 @@ SearchDirective = ($log, $compile, $templatecache) ->
         }
 
         renderTableContent = (section) ->
-            oldElements = $el.find(".search-result-table-body").children()
+            oldElements = $el.find(".search-result-table").children()
             oldScope = oldElements.scope()
 
             if oldScope
@@ -140,7 +140,7 @@ SearchDirective = ($log, $compile, $templatecache) ->
 
             template = angular.element.parseHTML(trim(templates[section.name]))
             element = $compile(template)(scope)
-            $el.find(".search-result-table-body").html(element)
+            $el.find(".search-result-table").html(element)
 
         $scope.$watch "searchResults", (data) ->
             lastSeatchResults = data
diff --git a/app/partials/views/modules/search-result-table.jade b/app/partials/views/modules/search-result-table.jade
index 47f737b3..ba57504c 100644
--- a/app/partials/views/modules/search-result-table.jade
+++ b/app/partials/views/modules/search-result-table.jade
@@ -1,36 +1,45 @@
 section.search-result-table
+
+script(type="text/ng-template", id="search-issues")
+    div.search-result-table-header
+        div.row.title
+            div.user-stories.width-4 Issues
+            div.status.width-2 Status
+            div.points.width-1 Assigned to
+    div.search-result-table-body
+        div.row.table-main(ng-repeat="issue in issues track by issue.id")
+            div.user-stories.width-6
+                div.user-story-name
+                    a(href="", tg-bo-html="issue.subject")
+            div.status.width-2(tg-issue-status="issue")
+            div.points.width-1(tg-issue-assignedto="issue")
+
+script(type="text/ng-template", id="search-userstories")
     div.search-result-table-header
         div.row.title
             div.user-stories.width-4 User Stories
             div.status.width-2 Status
             div.points.width-1 Points
-            div.points.width-1 Sprints
     div.search-result-table-body
-
-
-script(type="text/ng-template", id="search-issues")
-    div.row.table-main(ng-repeat="issue in issues track by issue.id")
-        div.user-stories.width-4
-            div.user-story-name
-                a(href="", tg-bo-html="issue.subject")
-        div.status.width-2 Status
-        div.points.width-1 12
-        div.points.width-1 54
-
-script(type="text/ng-template", id="search-userstories")
-    div.row.table-main(ng-repeat="us in userstories track by us.id")
-        div.user-stories.width-4
-            div.user-story-name
-                a(href="", tg-bo-html="us.subject")
-        div.status.width-2 Status
-        div.points.width-1 12
-        div.points.width-1 54
+        div.row.table-main(ng-repeat="us in userstories track by us.id")
+            div.user-stories.width-4
+                div.user-story-name
+                    a(href="", tg-bo-html="us.subject")
+            div.status.width-2 Status
+            div.points.width-1 12
 
 script(type="text/ng-template", id="search-tasks")
-    div.row.table-main(ng-repeat="task in tasks track by task.id")
-        div.user-stories.width-4
-            div.user-story-name
-                a(href="", tg-bo-html="task.subject")
-        div.status.width-2 Status
-        div.points.width-1 12
-        div.points.width-1 54
+    div.search-result-table-header
+        div.row.title
+            div.user-stories.width-4 Tasks
+            div.status.width-2 Status
+            div.points.width-1 Points
+            div.points.width-1 Sprints
+    div.search-result-table-body
+        div.row.table-main(ng-repeat="task in tasks track by task.id")
+            div.user-stories.width-4
+                div.user-story-name
+                    a(href="", tg-bo-html="task.subject")
+            div.status.width-2 Status
+            div.points.width-1 12
+            div.points.width-1 54