From f301c9241af577f8f3df94338f1329d91c82d252 Mon Sep 17 00:00:00 2001 From: "mkanat%bugzilla.org" <> Date: Sat, 1 Jul 2006 23:45:53 +0000 Subject: Bug 343248: SQL query to get all keywords with bug count is duplicated in editkeywords.cgi and describekeywords.cgi Patch By Remi Zara r=mkanat, a=justdave --- template/en/default/admin/keywords/list.html.tmpl | 2 +- template/en/default/filterexceptions.pl | 2 +- template/en/default/reports/keywords.html.tmpl | 11 ++++++----- 3 files changed, 8 insertions(+), 7 deletions(-) (limited to 'template/en') diff --git a/template/en/default/admin/keywords/list.html.tmpl b/template/en/default/admin/keywords/list.html.tmpl index 84eb6e9f1..999538561 100755 --- a/template/en/default/admin/keywords/list.html.tmpl +++ b/template/en/default/admin/keywords/list.html.tmpl @@ -22,7 +22,7 @@ #%] [%# INTERFACE: - # keywords: array of hashes having the properties: + # keywords: array keyword objects having the properties: # - id: number. The ID of the keyword. # - name: string. The name of the keyword. # - description: string. The description of the keyword. diff --git a/template/en/default/filterexceptions.pl b/template/en/default/filterexceptions.pl index 19f040c52..eee3b8963 100644 --- a/template/en/default/filterexceptions.pl +++ b/template/en/default/filterexceptions.pl @@ -114,7 +114,7 @@ 'reports/keywords.html.tmpl' => [ 'keyword.description', - 'keyword.bugcount', + 'keyword.bug_count', ], 'reports/report-table.csv.tmpl' => [ diff --git a/template/en/default/reports/keywords.html.tmpl b/template/en/default/reports/keywords.html.tmpl index c4aee3cae..979c50163 100644 --- a/template/en/default/reports/keywords.html.tmpl +++ b/template/en/default/reports/keywords.html.tmpl @@ -21,10 +21,11 @@ #%] [%# INTERFACE: - # keywords: array of hashes. May be empty. Each has has three members: + # keywords: array keyword objects. May be empty. Each has has four members: + # id: id of the keyword # name: the name of the keyword # description: keyword description. May be HTML. - # bugcount: number of bugs with that keyword + # bug_count: number of bugs with that keyword # caneditkeywords: boolean. True if this user can edit keywords %] @@ -56,7 +57,7 @@ [% keyword.description %] - [% IF keyword.bugcount > 0 %] + [% IF keyword.bug_count > 0 %] Search [% ELSE %] @@ -64,9 +65,9 @@ [% END %] - [% IF keyword.bugcount > 0 %] + [% IF keyword.bug_count > 0 %] - [% keyword.bugcount %] + [% keyword.bug_count %] [% ELSE %] none [% END %] -- cgit v1.2.3-24-g4f1b