Merge lp:~nskaggs/ubuntu-qa-website/revert-tracker-defect-changes into lp:ubuntu-qa-website

[Nicholas Skaggs]

Revert the changes to the defects tracker page to fix bug 1541586

Revert the changes to the defects tracker page to fix https://bugs.launchpad.net/ubuntu-qa-website/+bug/1541586

[Kev Bowring (flocculant)]

looks like the code we have to revert

review: Approve

=== modified file 'modules/qatracker/report/qatracker.report.defects.php'
--- modules/qatracker/report/qatracker.report.defects.php	2016-01-09 00:57:11 +0000
+++ modules/qatracker/report/qatracker.report.defects.php	2016-03-24 13:54:32 +0000
@@ -45,66 +45,53 @@
     return $content;
 }
 
-function qatracker_getbugs_for_release($siteid, $header) {
+function qatracker_getbugs_for_release($siteid) {
     /* 
      * Get all the bugs for all the milestones of a release 
      * for a given siteid 
      */
-    $query = db_select('qatracker_build', 'b')
-                ->extend('TableSort')
-                ->extend('PagerDefault');
-    $query->distinct();
-    $query->addField('m', 'title', 'mtitle');
-    $query->fields('l', array(
-        'bugnumber',
-        'product',
-        'title'));
-    $query->addField('l', 'title', 'btitle');
-    $query->fields('l', array(
-        'status',
-        'importance',
-        'assignee',
-        'commentscount',
-        'duplicatescount',
-        'subscriberscount'
-        ));
-    $query->addField('m', 'id');
-    $query->addExpression("CASE 
+
+    $result = db_query("
+SELECT  DISTINCT m.title mtitle
+       ,l.bugnumber
+       ,l.product
+       ,l.title btitle
+       ,l.status
+       ,l.importance 
+       ,l.assignee
+       ,l.commentscount
+       ,l.duplicatescount
+       ,l.subscriberscount
+       ,m.id
+       ,(CASE 
             WHEN l.importance = 'Critical' THEN 0
             WHEN l.importance = 'High' THEN 1
             WHEN l.importance = 'Medium' THEN 2
             WHEN l.importance = 'Low' THEN 3
             WHEN l.importance = 'Undecided' THEN 10
-        ELSE 5 END", 'importance_order');
-    $query->join('qatracker_product', 'p', 'p.id = b.productid');
-    $query->join('qatracker_build_milestone', 'bm', 'bm.buildid = b.id');
-    $query->join('qatracker_milestone', 'm', 'bm.milestoneid = m.id');
-    $query->join('qatracker_testsuite_product', 'tp', 'tp.productid = b.productid AND tp.milestone_seriesid = m.seriesid');
-    $query->join('qatracker_testsuite_testcase', 'tt', 'tt.testsuiteid = tp.testsuiteid');
-    $query->join('qatracker_testcase', 't', 'tt.testcaseid = t.id');
-    $query->join('qatracker_result', 'r', '(r.testcaseid = t.id AND r.buildid = b.id)');
-    $query->join('qatracker_bug', 'g', 'g.resultid = r.id');
-    $query->join('qatracker_launchpad_bug', 'l', 'g.bugnumber = l.originalbug');
-    $query->condition('m.siteid', intval($siteid));
-
-    $subquery = db_select('qatracker_milestone', 'm2');
-    $subquery->distinct();
-    $subquery->addExpression("SUBSTRING(m2.title, '^[^ ]+')");
-    $or = db_or();
-    $or->condition('m2.status', 0, '=');
-    $or->condition('m2.status', 1, '=');
-    $subquery->condition($or);
-    $subquery->condition('m2.siteid', 'm.siteid');
-
-    $query->addExpression("SUBSTRING(m.title, '^[^ ]+') IN (" . $subquery->__toString() . ')');
-    $or = db_or();
-    $or->condition('tt.status', 0, '=');
-    $or->condition('tt.status', 2, '=');
-    $query->condition($or);
-    $query->condition('tt.status', array(0, 2), 'IN');
-    $query->orderBy('m.id', 'DESC');
-    $query->orderByHeader($header);
-    return $query->execute()->fetchAll();
+        ELSE 5 END
+        ) importance_order
+FROM qatracker_build b
+JOIN qatracker_product p ON p.id = b.productid
+JOIN qatracker_build_milestone bm ON bm.buildid = b.id
+JOIN qatracker_milestone m ON bm.milestoneid = m.id
+JOIN qatracker_testsuite_product tp ON tp.productid = b.productid AND tp.milestone_seriesid = m.seriesid
+JOIN qatracker_testsuite_testcase tt ON tt.testsuiteid = tp.testsuiteid
+JOIN qatracker_testcase t ON tt.testcaseid = t.id
+JOIN qatracker_result r ON (r.testcaseid = t.id AND r.buildid = b.id)
+JOIN qatracker_bug g ON g.resultid = r.id
+JOIN qatracker_launchpad_bug l ON g.bugnumber = l.originalbug
+WHERE m.siteid = :siteid
+AND SUBSTRING(m.title, '^[^ ]+') IN (
+    SELECT DISTINCT SUBSTRING(m2.title, '^[^ ]+') 
+    FROM qatracker_milestone m2
+    WHERE m2.status IN (0,1)
+    AND m2.siteid = m.siteid
+)
+AND tt.status IN (0, 2)
+ORDER by m.id DESC, importance_order, l.status", array(":siteid" => intval($siteid)));
+
+    return $result->fetchAll();
 }
 
 
@@ -135,17 +122,17 @@
 
     $header = array(
         array('data' => 'Bug #'),
-        array('data' => 'Title', 'field' => 'btitle', 'sort' => 'DESC'),
-        array('data' => 'Affects', 'field' => 'l.product', 'sort' => 'DESC'),
-        array('data' => 'Status', 'field' => 'l.status', 'sort' => 'DESC'),
-        array('data' => 'Importance', 'field' => 'l.importance', 'sort' => 'DESC'),
-        array('data' => 'Assignee', 'field' => 'l.assignee', 'sort' => 'DESC'),
-        array('data' => 'Com.', 'field' => 'l.commentscount', 'sort' => 'DESC'),
-        array('data' => 'Sub.', 'field' => 'l.subscriberscount', 'sort' => 'DESC'),
-        array('data' => 'Dup.', 'field' => 'l.duplicatescount', 'sort' => 'DESC'),
+        array('data' => 'Title'),
+        array('data' => 'Affects'),
+        array('data' => 'Status'),
+        array('data' => 'Importance'),
+        array('data' => 'Assignee'),
+        array('data' => 'Com.'),
+        array('data' => 'Sub.'),
+        array('data' => 'Dup.'),
     );
 
-    $bugs = qatracker_getbugs_for_release($siteid, $header);
+    $bugs = qatracker_getbugs_for_release($siteid);
 
     $curr_milestone = "";
     $rows = array();