Ubuntu QA Website

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

  1. bug_1526461
  2. Merge into drupal7-rewrite
Proposed by Hunter
Status: Merged
Merged at revision: 409
Proposed branch: lp:~hjarrell555/ubuntu-qa-website/bug_1526461
Merge into: lp:ubuntu-qa-website
Diff against target: 95 lines (+2/-27)
1 file modified
modules/qatracker/user/qatracker.user.results.php (+2/-27)
To merge this branch: bzr merge lp:~hjarrell555/ubuntu-qa-website/bug_1526461
Reviewer Review Type Date Requested Status
Pasi Lallinaho (community) Approve
Review via email: mp+280849@code.launchpad.net

Description of the change

Removed hardware link entry field for reporting new bugs on results page and machine column from table on results page.

To post a comment you must log in.
Revision history for this message
Pasi Lallinaho (knome) wrote :

Looks good to me.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'modules/qatracker/user/qatracker.user.results.php'
2--- modules/qatracker/user/qatracker.user.results.php 2015-12-15 15:17:35 +0000
3+++ modules/qatracker/user/qatracker.user.results.php 2015-12-17 13:50:38 +0000
4@@ -238,7 +238,7 @@
5
6 # Getting all the entries
7 $query = db_select('qatracker_result');
8- $query->fields('qatracker_result', array('id', 'reporterid', 'date', 'result', 'comment', 'hardware', 'lastchange', 'status', 'testcaseid', 'revisionid'));
9+ $query->fields('qatracker_result', array('id', 'reporterid', 'date', 'result', 'comment', 'lastchange', 'status', 'testcaseid', 'revisionid'));
10 $query->addExpression('greatest(qatracker_result.date, qatracker_result.lastchange)', 'last_touched');
11 $query->orderBy('qatracker_result.result', 'ASC');
12 $query->orderBy('last_touched', 'DESC');
13@@ -258,7 +258,6 @@
14 array('data' => '', 'style' => 'width:0'),
15 array('data' => t('Reporter'), 'style' => 'width:10em'),
16 array('data' => t('Last update'), 'style' => 'width:10em'),
17- array('data' => t('Machine'), 'style' => 'width:5em;text-align:center;'),
18 array('data' => t('Bugs'), 'style' => 'width:10em;text-align:center;'),
19 array('data' => t('Comment'), 'style' => 'width:auto'),
20 array('data' => '', 'style' => 'width:5em'),
21@@ -357,18 +356,6 @@
22 )
23 );
24
25- # Hardware profile
26- $hardware = "";
27- if ($record->hardware) {
28- $hardware = l(theme(
29- "image",
30- array(
31- 'path' => "/modules/qatracker/misc/machine.png",
32- 'alt' => $qatracker_result_result[$record->result]
33- )
34- ), $record->hardware, array('html' => TRUE));
35- }
36-
37 # Links
38 $links = array();
39 if ($record->revisionid) {
40@@ -401,7 +388,6 @@
41 $icon,
42 l($account->name, "http://launchpad.net/~".$account->name),
43 format_date(strtotime($record->last_touched), 'short'),
44- array('data' => $hardware, 'style' => 'text-align:center;'),
45 array('data' => $bugs, 'style' => 'text-align:center;'),
46 check_markup($record->comment),
47 array('data' => implode(" ", $links), 'style' => 'text-align:center;'),
48@@ -451,7 +437,7 @@
49 $resultid = arg(8);
50
51 $query = db_select('qatracker_result');
52- $query->fields('qatracker_result', array('id', 'reporterid', 'date', 'result', 'comment', 'hardware', 'lastchange', 'status'));
53+ $query->fields('qatracker_result', array('id', 'reporterid', 'date', 'result', 'comment', 'lastchange', 'status'));
54 $query->leftJoin('qatracker_build', 'qatracker_build', 'qatracker_build.id=qatracker_result.buildid');
55 $query->addField('qatracker_build', 'productid', 'productid');
56 $query->addExpression('greatest(qatracker_result.date, qatracker_result.lastchange)', 'last_touched');
57@@ -576,7 +562,6 @@
58 $user_result->id = Null;
59 $user_result->result = 0;
60 $user_result->comment = "";
61- $user_result->hardware = "";
62 $user_result->critical_bugs = array();
63 $user_result->regular_bugs = array();
64 }
65@@ -603,14 +588,6 @@
66 '#default_value' => implode(", ", $user_result->regular_bugs),
67 );
68
69- $form['qatracker_result']['hardware'] = array(
70- '#type' => 'textfield',
71- '#title' => t('Hardware profile'),
72- '#description' => t('URL to the hardware profile'),
73- '#default_value' => $user_result->hardware,
74- '#maxlength' => 1000,
75- );
76-
77 $form['qatracker_result']['comment'] = array(
78 '#type' => 'textarea',
79 '#title' => t('Comment'),
80@@ -728,7 +705,6 @@
81 'date' => date("Y-m-d H:i:s"),
82 'result' => $form['qatracker_result']['result']['#value'],
83 'comment' => $form['qatracker_result']['comment']['#value'],
84- 'hardware' => $form['qatracker_result']['hardware']['#value'],
85 'status' => 0,
86 ));
87
88@@ -745,7 +721,6 @@
89 'changedby' => $user->uid,
90 'result' => $form['qatracker_result']['result']['#value'],
91 'comment' => $form['qatracker_result']['comment']['#value'],
92- 'hardware' => $form['qatracker_result']['hardware']['#value'],
93 'status' => 0,
94 ));
95 $query->execute();

Subscribers

People subscribed via source and target branches