From 52deac516eb3dd1cc22f97b3a295ee856f69d354 Mon Sep 17 00:00:00 2001
From: Hugo Seabrook <hugo.seabrook@gmail.com>
Date: Wed, 30 Jan 2013 19:05:50 +0100
Subject: Bug 102048: Display the "Blocks" and "Depends On" columns in buglists
 r/a=LpSolit

---
 Bugzilla/Field.pm                        |  4 ++--
 Bugzilla/Search.pm                       | 13 +++++++++++++
 template/en/default/list/table.html.tmpl |  2 ++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/Bugzilla/Field.pm b/Bugzilla/Field.pm
index c85d43bb8..c4ee77498 100644
--- a/Bugzilla/Field.pm
+++ b/Bugzilla/Field.pm
@@ -200,9 +200,9 @@ use constant DEFAULT_FIELDS => (
      buglist => 1},
     {name => 'cc',           desc => 'CC',         in_new_bugmail => 1},
     {name => 'dependson',    desc => 'Depends on', in_new_bugmail => 1,
-     is_numeric => 1},
+     is_numeric => 1, buglist => 1},
     {name => 'blocked',      desc => 'Blocks',     in_new_bugmail => 1,
-     is_numeric => 1},
+     is_numeric => 1, buglist => 1},
 
     {name => 'attachments.description', desc => 'Attachment description'},
     {name => 'attachments.filename',    desc => 'Attachment filename'},
diff --git a/Bugzilla/Search.pm b/Bugzilla/Search.pm
index 1c6af782e..658b85f99 100644
--- a/Bugzilla/Search.pm
+++ b/Bugzilla/Search.pm
@@ -468,6 +468,14 @@ sub COLUMN_JOINS {
                 to    => 'id',
             },
         },
+        blocked => {
+            table => 'dependencies',
+            to => 'dependson',
+        },
+        dependson => {
+            table => 'dependencies',
+            to => 'blocked',
+        },
         'longdescs.count' => {
             table => 'longdescs',
             join  => 'INNER',
@@ -548,6 +556,9 @@ sub COLUMNS {
             . $dbh->sql_string_concat('map_flagtypes.name', 'map_flags.status')),
 
         'keywords' => $dbh->sql_group_concat('DISTINCT map_keyworddefs.name'),
+
+        blocked => $dbh->sql_group_concat('DISTINCT map_blocked.blocked'),
+        dependson => $dbh->sql_group_concat('DISTINCT map_dependson.dependson'),
         
         'longdescs.count' => 'COUNT(DISTINCT map_longdescs_count.comment_id)',
 
@@ -645,7 +656,9 @@ sub REPORT_COLUMNS {
 # is here because it *always* goes into the GROUP BY as the first item,
 # so it should be skipped when determining extra GROUP BY columns.
 use constant GROUP_BY_SKIP => qw(
+    blocked
     bug_id
+    dependson
     flagtypes.name
     keywords
     longdescs.count
diff --git a/template/en/default/list/table.html.tmpl b/template/en/default/list/table.html.tmpl
index b686e7924..e68542515 100644
--- a/template/en/default/list/table.html.tmpl
+++ b/template/en/default/list/table.html.tmpl
@@ -46,6 +46,8 @@
     "short_short_desc"  => { maxlength => 60 , ellipsis => "..." , wrap => 1 } ,
     "status_whiteboard" => { maxlength => 0, title => "Whiteboard" , wrap => 1 } , 
     "keywords"          => { maxlength => 0, wrap => 1 } ,
+    "dependson"         => { maxlength => 0, wrap => 1 } ,
+    "blocked"           => { maxlength => 0, wrap => 1 } ,
     "flagtypes.name"    => { maxlength => 0, wrap => 1 } ,
     "component"         => { maxlength => 8 , title => "Comp" } , 
     "product"           => { maxlength => 8 } , 
-- 
cgit v1.2.3-24-g4f1b