Merge lp:~hjarrell555/ubuntu-qa-website/bug_1366581 into lp:ubuntu-qa-website

[Hunter]

Changed the list of previous bugs on user results page to a table of bugs to better see the information related to the bugs.

[Nicholas Skaggs (nskaggs)]

I get issues with running this on my install:

Warning: Creating default object from empty value in qatracker_user_results_form() (line 541 of /usr/share/drupal7/modules/qatracker/user/qatracker.user.results.php).

Are you running into this Hunter?

review: Needs Information

[Hunter (hjarrell555)]

I've had this since I started GCI. I reverted to a revision before my code and I think the issue is still there.

[Nicholas Skaggs (nskaggs)]

Gotcha, this is part of the production deploy happening today. Hunter, where you able to load a production snapshot on your local instance? If so, might be useful to update the wiki with how exactly you did so.

[Hunter (hjarrell555)]

I only restored the one table but I'd be happy to show how I did it. What page did you have in mind to add it to or did you mean on a new page?

=== modified file 'modules/qatracker/user/qatracker.user.results.php'
--- modules/qatracker/user/qatracker.user.results.php	2015-12-16 21:56:07 +0000
+++ modules/qatracker/user/qatracker.user.results.php	2015-12-24 02:48:52 +0000
@@ -533,16 +533,7 @@
         $bugs = t("None");
     }
 
-    $form['old_bugs'] = array(
-        '#type' => 'fieldset',
-        '#title' => 'Bugs',
-    );
-    $form['old_bugs'][] = array(
-        '#type' => 'markup',
-        '#prefix' => '<h2>'.t("Bugs to look for").'</h2>',
-        '#markup' => $bugs,
-        '#suffix' => '<br /><small>'.t('List of bugs that were previously reported for this testcase.').'</small>',
-    );
+    $form['old bugs'] = create_bug_table();
 
     if ($user_result) {
         $form['qatracker_result'] = array(
@@ -783,4 +774,81 @@
     return $form;
 }
 
+function create_bug_table() {
+    $milestoneid=arg(2);
+    $testcaseid=arg(6);
+
+    $header = array(
+        array('data' => t('Bug #'), 'style' => 'width:5em;text-align:center'),
+        array('data' => t('Title'), 'style' => 'width:auto;text-align:left'),
+        array('data' => t('Status'), 'field' => 'status', 'style' => 'width:4em;text-align:center', 'sort' => 'DESC'),
+        array('data' => t('Importance'), 'field' => 'importance', 'style' => 'width:4em;text-align:center', 'sort' => 'DESC'),
+        array('data' => t('Assignee'), 'style' => 'width:4em;text-align:center'),
+        array('data' => t('Product'), 'style' => 'width:6em;text-align:left')
+    );
+
+    # Get bugs stats (FIXME: copy/paste from qatracker_build_stats, should be moved to separate function)
+    $query = db_select('qatracker_launchpad_bug')
+                ->extend('TableSort')
+                ->extend('PagerDefault');
+    $query->fields('qatracker_launchpad_bug', array(
+        'bugnumber',
+        'title',
+        'product',
+        'status',
+        'importance',
+        'assignee',
+        'commentscount',
+        'duplicatescount',
+        'subscriberscount',
+        'lastchange'
+    ));
+    $query->addField('qatracker_bug', 'bugnumber', 'originalbug');
+    $query->addExpression('COUNT(qatracker_bug.bugnumber)', 'reportedcount');
+    $query->addExpression('MAX(qatracker_bug.bugimportance)', 'maximportance');
+    $query->rightjoin('qatracker_bug', 'qatracker_bug', 'qatracker_bug.bugnumber = qatracker_launchpad_bug.originalbug');
+    $query->leftjoin('qatracker_result', 'qatracker_result', 'qatracker_result.id = qatracker_bug.resultid');
+    $query->leftjoin('qatracker_build', 'qatracker_build', 'qatracker_build.id = qatracker_result.buildid');
+    $query->leftjoin('qatracker_build_milestone', 'qatracker_build_milestone', 'qatracker_build_milestone.buildid = qatracker_result.buildid');
+    $query->groupBy('
+        qatracker_bug.bugnumber,
+        qatracker_launchpad_bug.bugnumber,
+        qatracker_launchpad_bug.title,
+        qatracker_launchpad_bug.product,
+        qatracker_launchpad_bug.status,
+        qatracker_launchpad_bug.importance,
+        qatracker_launchpad_bug.assignee,
+        qatracker_launchpad_bug.commentscount,
+        qatracker_launchpad_bug.duplicatescount,
+        qatracker_launchpad_bug.subscriberscount,
+        qatracker_launchpad_bug.lastchange'
+    );
+    $query->condition('qatracker_build_milestone.milestoneid', $milestoneid);
+    $query->condition('qatracker_result.testcaseid', $testcaseid);
+    $query->orderByHeader($header);
+
+    $bugs = $query->execute()->fetchAll();
+
+    $rows = array();
+    foreach ($bugs as $bug) {
+        if (!empty($bug->bugnumber)) {
+            $rows[] = array(
+                '<a href="http://launchpad.net/bugs/'.$bug->bugnumber.'">'.$bug->bugnumber.'</a>',
+                $bug->title,
+                $bug->status,
+                $bug->importance,
+                $bug->assignee,
+                $bug->product
+            );
+        }
+    }
+
+    return array(
+        '#theme' => "table",
+        '#header' => $header,
+        '#rows' => $rows,
+        '#prefix' => '<h2>'.t("Bugs to look for").'</h2>'
+    );
+}
+
 ?>