[MediaWiki-commits] [Gerrit] duplicates.cgi: Add Resolution and Priority columns - change (wikimedia...modifications)
Dzahn has submitted this change and it was merged.
Change subject: duplicates.cgi: Add Resolution and Priority columns
..
duplicates.cgi: Add Resolution and Priority columns
...and remove less used OS column. File is a copy of upstream
4.4 file (do not apply on 4.2) at
http://bzr.mozilla.org/bugzilla/4.4/view/head:/template/en/default/reports/duplicates-table.html.tmpl
Our custom changes are marked with Wikimedia in the source code.
Bug: 56253
Bug: 58749
Change-Id: I7c13f73c07357a0d0d37f2650937355ffaad4be6
---
A template/en/custom/reports/duplicates-table.html.tmpl
1 file changed, 118 insertions(+), 0 deletions(-)
Approvals:
Dzahn: Verified; Looks good to me, approved
diff --git a/template/en/custom/reports/duplicates-table.html.tmpl
b/template/en/custom/reports/duplicates-table.html.tmpl
new file mode 100644
index 000..4ee4644
--- /dev/null
+++ b/template/en/custom/reports/duplicates-table.html.tmpl
@@ -0,0 +1,118 @@
+[%# This Source Code Form is subject to the terms of the Mozilla Public
+ # License, v. 2.0. If a copy of the MPL was not distributed with this
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ #
+ # This Source Code Form is Incompatible With Secondary Licenses, as
+ # defined by the Mozilla Public License, v. 2.0.
+ #%]
+
+[%# INTERFACE:
+ # bugs: list of hashes. May be empty. Each hash has three members:
+ # bug: A Bugzilla::Bug object
+ # count: integer. The number of dupes
+ # delta: integer. The change in count in the last $changedsince days
+ #
+ # bug_ids: list of integers. May be empty. The IDs of the bugs in $bugs.
+ #
+ # sortby: string. the column on which we are sorting the buglist.
+ # reverse: boolean. True if we are reversing the current sort.
+ # maxrows: integer. Max number of rows to display.
+ # changedsince: integer. The number of days ago for the changedsince column.
+ # openonly: boolean. True if we are only showing open bugs.
+ # product: array of strings. Restrict to these products only.
+ #%]
+
+[%# *** Column Headers *** %]
+
+[%# WIKIMEDIA 58749 and 56253: resolution and priority columns %]
+[% SET columns = [
+{ name = id, description = $terms.Bug # },
+{ name = count, description = DupebrCount },
+{ name = delta,
+ description = Change in lastbr$changedsince day(s) },
+{ name = component, description = field_descs.component },
+{ name = resolution, description = field_descs.resolution },
+{ name = bug_severity, description = field_descs.bug_severity },
+{ name = priority, description = field_descs.priority },
+{ name = target_milestone, description = field_descs.target_milestone
},
+{ name = short_desc, description = field_descs.short_desc },
+] %]
+
+[% SET base_args = [] %]
+[% FOREACH param = ['maxrows', 'openonly', 'format', 'sortvisible',
+'changedsince', 'product']
+%]
+ [% NEXT IF NOT ${param}.defined %]
+ [% FOREACH value = ${param} %]
+[% filtered_value = value FILTER uri %]
+[% base_args.push($param=$filtered_value) %]
+ [% END %]
+[% END %]
+[% IF sortvisible %]
+ [% bug_ids_string = bug_ids.nsort.join(',') FILTER uri %]
+ [% base_args.push(bug_id=$bug_ids_string) %]
+[% END %]
+[% base_args_string = base_args.join('amp;') %]
+
+[% IF bugs.size %]
+ table id=duplicates_table cellpadding=0 cellspacing=0
+thead
+ tr
+[% FOREACH column = columns %]
+ [% IF column.name == sortby %]
+[%# We add this to the column object so it doesn't affect future
+ # iterations of the loop.
+ #%]
+[% column.reverse_sort = reverse ? 0 : 1 %]
+ [% END %]
+ th class=[% column.name FILTER html %]
+a href=duplicates.cgi?sortby=[% column.name FILTER uri %]
+ [% IF column.reverse_sort.defined %]
+ [%- %]amp;reverse=[% column.reverse_sort FILTER uri %]
+ [% END %]
+ [% IF base_args_string %]
+ [% amp;$base_args_string FILTER none %]
+ [% END %]
+[% column.description FILTER none %]/a
+ /th
+[% END %]
+ /tr
+/thead
+
+[%# *** Buglist *** %]
+
+tbody
+ [% FOREACH item = bugs %]
+[% SET bug = item.bug %]
+tr [% class='resolved' IF NOT bug.isopened %]
+ td class=id
+[% bug.id FILTER bug_link(bug) FILTER none %]
+ /td
+ td class=count[% item.count FILTER html %]/td
+ td class=delta[% item.delta FILTER html %]/td
+ td class=component[% bug.component FILTER html %]/td
+[%# WIKIMEDIA START 58749 %]
+ td class=resolution
+[%- display_value('resolution', bug.resolution) FILTER html %]
+ /td
+[%# WIKIMEDIA END 58749 %]
+ td class=bug_severity
+[%- display_value('bug_severity', bug.bug_severity)
[MediaWiki-commits] [Gerrit] duplicates.cgi: Add Resolution and Priority columns - change (wikimedia...modifications)
Aklapper has uploaded a new change for review.
https://gerrit.wikimedia.org/r/105938
Change subject: duplicates.cgi: Add Resolution and Priority columns
..
duplicates.cgi: Add Resolution and Priority columns
...and remove less used OS column. File is a copy of upstream
4.4 file (do not apply on 4.2) at
http://bzr.mozilla.org/bugzilla/4.4/view/head:/template/en/default/reports/duplicates-table.html.tmpl
Our custom changes are marked with Wikimedia in the source code.
Bug: 56253
Bug: 58749
Change-Id: I7c13f73c07357a0d0d37f2650937355ffaad4be6
---
A template/en/custom/reports/duplicates-table.html.tmpl
1 file changed, 121 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/bugzilla/modifications
refs/changes/38/105938/1
diff --git a/template/en/custom/reports/duplicates-table.html.tmpl
b/template/en/custom/reports/duplicates-table.html.tmpl
new file mode 100644
index 000..21229d8
--- /dev/null
+++ b/template/en/custom/reports/duplicates-table.html.tmpl
@@ -0,0 +1,121 @@
+[%# This Source Code Form is subject to the terms of the Mozilla Public
+ # License, v. 2.0. If a copy of the MPL was not distributed with this
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ #
+ # This Source Code Form is Incompatible With Secondary Licenses, as
+ # defined by the Mozilla Public License, v. 2.0.
+ #%]
+
+[%# INTERFACE:
+ # bugs: list of hashes. May be empty. Each hash has three members:
+ # bug: A Bugzilla::Bug object
+ # count: integer. The number of dupes
+ # delta: integer. The change in count in the last $changedsince days
+ #
+ # bug_ids: list of integers. May be empty. The IDs of the bugs in $bugs.
+ #
+ # sortby: string. the column on which we are sorting the buglist.
+ # reverse: boolean. True if we are reversing the current sort.
+ # maxrows: integer. Max number of rows to display.
+ # changedsince: integer. The number of days ago for the changedsince column.
+ # openonly: boolean. True if we are only showing open bugs.
+ # product: array of strings. Restrict to these products only.
+ #%]
+
+[%# *** Column Headers *** %]
+
+[% SET columns = [
+{ name = id, description = $terms.Bug # },
+{ name = count, description = DupebrCount },
+{ name = delta,
+ description = Change in lastbr$changedsince day(s) },
+{ name = component, description = field_descs.component },
+[%# WIKIMEDIA START 58749 %]
+{ name = resolution, description = field_descs.resolution },
+[%# WIKIMEDIA END 58749 %]
+{ name = bug_severity, description = field_descs.bug_severity },
+[%# WIKIMEDIA START 56253 %]
+{ name = priority, description = field_descs.priority },
+[%# WIKIMEDIA END 56253 %]
+{ name = target_milestone, description = field_descs.target_milestone
},
+{ name = short_desc, description = field_descs.short_desc },
+] %]
+
+[% SET base_args = [] %]
+[% FOREACH param = ['maxrows', 'openonly', 'format', 'sortvisible',
+'changedsince', 'product']
+%]
+ [% NEXT IF NOT ${param}.defined %]
+ [% FOREACH value = ${param} %]
+[% filtered_value = value FILTER uri %]
+[% base_args.push($param=$filtered_value) %]
+ [% END %]
+[% END %]
+[% IF sortvisible %]
+ [% bug_ids_string = bug_ids.nsort.join(',') FILTER uri %]
+ [% base_args.push(bug_id=$bug_ids_string) %]
+[% END %]
+[% base_args_string = base_args.join('amp;') %]
+
+[% IF bugs.size %]
+ table id=duplicates_table cellpadding=0 cellspacing=0
+thead
+ tr
+[% FOREACH column = columns %]
+ [% IF column.name == sortby %]
+[%# We add this to the column object so it doesn't affect future
+ # iterations of the loop.
+ #%]
+[% column.reverse_sort = reverse ? 0 : 1 %]
+ [% END %]
+ th class=[% column.name FILTER html %]
+a href=duplicates.cgi?sortby=[% column.name FILTER uri %]
+ [% IF column.reverse_sort.defined %]
+ [%- %]amp;reverse=[% column.reverse_sort FILTER uri %]
+ [% END %]
+ [% IF base_args_string %]
+ [% amp;$base_args_string FILTER none %]
+ [% END %]
+[% column.description FILTER none %]/a
+ /th
+[% END %]
+ /tr
+/thead
+
+[%# *** Buglist *** %]
+
+tbody
+ [% FOREACH item = bugs %]
+[% SET bug = item.bug %]
+tr [% class='resolved' IF NOT bug.isopened %]
+ td class=id
+[% bug.id FILTER bug_link(bug) FILTER none %]
+ /td
+ td class=count[% item.count FILTER html %]/td
+ td class=delta[% item.delta FILTER html %]/td
+ td class=component[% bug.component FILTER html %]/td
+[%# WIKIMEDIA START 58749 %]
+ td class=resolution
+[%- display_value('resolution', bug.resolution) FILTER html %]
+
