From: Max Kanat-Alexander <mkanat@bugzilla.org>
Date: Thu, 8 Jul 2010 23:22:08 +0000 (-0700)
Subject: Bug 577575: If percentage_complete is a column in the buglist, remaining_time
X-Git-Tag: bugzilla-4.1.1~443
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d500177f7ce877bf1f535df96c1231651355e199;p=thirdparty%2Fbugzilla.git

Bug 577575: If percentage_complete is a column in the buglist, remaining_time
must also be selected from the database for PostgreSQL.
r=mkanat, a=mkanat (module owner)
---

diff --git a/Bugzilla/Search.pm b/Bugzilla/Search.pm
index b7c2f06ba0..68144b376c 100644
--- a/Bugzilla/Search.pm
+++ b/Bugzilla/Search.pm
@@ -538,6 +538,15 @@ sub init {
         push(@supptables, "LEFT JOIN keywords ON keywords.bug_id = bugs.bug_id");
         push(@supptables, "LEFT JOIN keyworddefs ON keyworddefs.id = keywords.keywordid");
     }
+    
+    # Calculating percentage_complete requires remaining_time. Mostly,
+    # we just need remaining_time in the GROUP_BY, but it simplifies
+    # things to just add it in the SELECT.
+    if (grep($_ eq 'percentage_complete', @fields)
+        and !grep($_ eq 'remaining_time', @fields))
+    {
+        push(@fields, 'remaining_time');
+    }
 
     # If the user has selected all of either status or resolution, change to
     # selecting none. This is functionally equivalent, but quite a lot faster.