1
=== modified file 'modules/qatracker/report/qatracker.report.defects.php'
2
--- modules/qatracker/report/qatracker.report.defects.php	2012-11-06 21:45:44 +0000
3
+++ modules/qatracker/report/qatracker.report.defects.php	2016-01-09 00:57:52 +0000
4
@@ -45,53 +45,66 @@
5
45
    return $content;
45
    return $content;
6
46
}
46
}
7
47
47
9
48
function qatracker_getbugs_for_release($siteid) {
48
function qatracker_getbugs_for_release($siteid, $header) {
10
49
    /* 
49
    /* 
11
50
     * Get all the bugs for all the milestones of a release 
50
     * Get all the bugs for all the milestones of a release 
12
51
     * for a given siteid 
51
     * for a given siteid 
13
52
     */
52
     */
28
53
53
    $query = db_select('qatracker_build', 'b')
29
54
    $result = db_query("
54
                ->extend('TableSort')
30
55
SELECT  DISTINCT m.title mtitle
55
                ->extend('PagerDefault');
31
56
       ,l.bugnumber
56
    $query->distinct();
32
57
       ,l.product
57
    $query->addField('m', 'title', 'mtitle');
33
58
       ,l.title btitle
58
    $query->fields('l', array(
34
59
       ,l.status
59
        'bugnumber',
35
60
       ,l.importance 
60
        'product',
36
61
       ,l.assignee
61
        'title'));
37
62
       ,l.commentscount
62
    $query->addField('l', 'title', 'btitle');
38
63
       ,l.duplicatescount
63
    $query->fields('l', array(
39
64
       ,l.subscriberscount
64
        'status',
40
65
       ,m.id
65
        'importance',
41
66
       ,(CASE 
66
        'assignee',
42
67
        'commentscount',
43
68
        'duplicatescount',
44
69
        'subscriberscount'
45
70
        ));
46
71
    $query->addField('m', 'id');
47
72
    $query->addExpression("CASE 
48
67
            WHEN l.importance = 'Critical' THEN 0
73
            WHEN l.importance = 'Critical' THEN 0
49
68
            WHEN l.importance = 'High' THEN 1
74
            WHEN l.importance = 'High' THEN 1
50
69
            WHEN l.importance = 'Medium' THEN 2
75
            WHEN l.importance = 'Medium' THEN 2
51
70
            WHEN l.importance = 'Low' THEN 3
76
            WHEN l.importance = 'Low' THEN 3
52
71
            WHEN l.importance = 'Undecided' THEN 10
77
            WHEN l.importance = 'Undecided' THEN 10
76
72
        ELSE 5 END
78
        ELSE 5 END", 'importance_order');
77
73
        ) importance_order
79
    $query->join('qatracker_product', 'p', 'p.id = b.productid');
78
74
FROM qatracker_build b
80
    $query->join('qatracker_build_milestone', 'bm', 'bm.buildid = b.id');
79
75
JOIN qatracker_product p ON p.id = b.productid
81
    $query->join('qatracker_milestone', 'm', 'bm.milestoneid = m.id');
80
76
JOIN qatracker_build_milestone bm ON bm.buildid = b.id
82
    $query->join('qatracker_testsuite_product', 'tp', 'tp.productid = b.productid AND tp.milestone_seriesid = m.seriesid');
81
77
JOIN qatracker_milestone m ON bm.milestoneid = m.id
83
    $query->join('qatracker_testsuite_testcase', 'tt', 'tt.testsuiteid = tp.testsuiteid');
82
78
JOIN qatracker_testsuite_product tp ON tp.productid = b.productid AND tp.milestone_seriesid = m.seriesid
84
    $query->join('qatracker_testcase', 't', 'tt.testcaseid = t.id');
83
79
JOIN qatracker_testsuite_testcase tt ON tt.testsuiteid = tp.testsuiteid
85
    $query->join('qatracker_result', 'r', '(r.testcaseid = t.id AND r.buildid = b.id)');
84
80
JOIN qatracker_testcase t ON tt.testcaseid = t.id
86
    $query->join('qatracker_bug', 'g', 'g.resultid = r.id');
85
81
JOIN qatracker_result r ON (r.testcaseid = t.id AND r.buildid = b.id)
87
    $query->join('qatracker_launchpad_bug', 'l', 'g.bugnumber = l.originalbug');
86
82
JOIN qatracker_bug g ON g.resultid = r.id
88
    $query->condition('m.siteid', intval($siteid));
87
83
JOIN qatracker_launchpad_bug l ON g.bugnumber = l.originalbug
89
88
84
WHERE m.siteid = :siteid
90
    $subquery = db_select('qatracker_milestone', 'm2');
89
85
AND SUBSTRING(m.title, '^[^ ]+') IN (
91
    $subquery->distinct();
90
86
    SELECT DISTINCT SUBSTRING(m2.title, '^[^ ]+') 
92
    $subquery->addExpression("SUBSTRING(m2.title, '^[^ ]+')");
91
87
    FROM qatracker_milestone m2
93
    $or = db_or();
92
88
    WHERE m2.status IN (0,1)
94
    $or->condition('m2.status', 0, '=');
93
89
    AND m2.siteid = m.siteid
95
    $or->condition('m2.status', 1, '=');
94
90
)
96
    $subquery->condition($or);
95
91
AND tt.status IN (0, 2)
97
    $subquery->condition('m2.siteid', 'm.siteid');
96
92
ORDER by m.id DESC, importance_order, l.status", array(":siteid" => intval($siteid)));
98
97
93
99
    $query->addExpression("SUBSTRING(m.title, '^[^ ]+') IN (" . $subquery->__toString() . ')');
98
94
    return $result->fetchAll();
100
    $or = db_or();
99
101
    $or->condition('tt.status', 0, '=');
100
102
    $or->condition('tt.status', 2, '=');
101
103
    $query->condition($or);
102
104
    $query->condition('tt.status', array(0, 2), 'IN');
103
105
    $query->orderBy('m.id', 'DESC');
104
106
    $query->orderByHeader($header);
105
107
    return $query->execute()->fetchAll();
106
95
}
108
}
107
96
109
108
97
110
109
@@ -122,17 +135,17 @@
110
122
135
111
123
    $header = array(
136
    $header = array(
112
124
        array('data' => 'Bug #'),
137
        array('data' => 'Bug #'),
121
125
        array('data' => 'Title'),
138
        array('data' => 'Title', 'field' => 'btitle', 'sort' => 'DESC'),
122
126
        array('data' => 'Affects'),
139
        array('data' => 'Affects', 'field' => 'l.product', 'sort' => 'DESC'),
123
127
        array('data' => 'Status'),
140
        array('data' => 'Status', 'field' => 'l.status', 'sort' => 'DESC'),
124
128
        array('data' => 'Importance'),
141
        array('data' => 'Importance', 'field' => 'l.importance', 'sort' => 'DESC'),
125
129
        array('data' => 'Assignee'),
142
        array('data' => 'Assignee', 'field' => 'l.assignee', 'sort' => 'DESC'),
126
130
        array('data' => 'Com.'),
143
        array('data' => 'Com.', 'field' => 'l.commentscount', 'sort' => 'DESC'),
127
131
        array('data' => 'Sub.'),
144
        array('data' => 'Sub.', 'field' => 'l.subscriberscount', 'sort' => 'DESC'),
128
132
        array('data' => 'Dup.'),
145
        array('data' => 'Dup.', 'field' => 'l.duplicatescount', 'sort' => 'DESC'),
129
133
    );
146
    );
130
134
147
132
135
    $bugs = qatracker_getbugs_for_release($siteid);
148
    $bugs = qatracker_getbugs_for_release($siteid, $header);
133
136
149
134
137
    $curr_milestone = "";
150
    $curr_milestone = "";
135
138
    $rows = array();
151
    $rows = array();
Reviewer	Review Type	Date Requested	Status
Nicholas Skaggs (community)		2016-01-07	Approve on 2016-01-12
Review via email: mp+281817@code.launchpad.net