From e66bfda7983913ac93247d3e6f993c0ce1bbe7c7 Mon Sep 17 00:00:00 2001 From: "lpsolit%gmail.com" <> Date: Tue, 18 Oct 2005 04:43:40 +0000 Subject: Bug 299753: Replace old code in editproducts.cgi by routines from Product.pm - Patch by André Batosti r=LpSolit a=justdave MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/products/confirm-delete.html.tmpl | 131 ++++++++++----------- .../en/default/admin/products/create.html.tmpl | 11 +- .../en/default/admin/products/created.html.tmpl | 9 +- .../en/default/admin/products/deleted.html.tmpl | 9 +- .../default/admin/products/edit-common.html.tmpl | 7 +- template/en/default/admin/products/edit.html.tmpl | 66 +++++------ .../en/default/admin/products/footer.html.tmpl | 31 ++--- .../products/groupcontrol/confirm-edit.html.tmpl | 6 +- .../admin/products/groupcontrol/edit.html.tmpl | 14 ++- .../admin/products/groupcontrol/updated.html.tmpl | 8 +- template/en/default/admin/products/list.html.tmpl | 48 ++++---- .../en/default/admin/products/updated.html.tmpl | 112 ++++++++---------- template/en/default/filterexceptions.pl | 3 - 13 files changed, 218 insertions(+), 237 deletions(-) (limited to 'template') diff --git a/template/en/default/admin/products/confirm-delete.html.tmpl b/template/en/default/admin/products/confirm-delete.html.tmpl index 672f345e9..9358974de 100644 --- a/template/en/default/admin/products/confirm-delete.html.tmpl +++ b/template/en/default/admin/products/confirm-delete.html.tmpl @@ -15,32 +15,16 @@ #%] [%# INTERFACE: - # product_name: string; The name of the product - # - # prod_description: string; Product description, may be empty + # product: Bugzilla::Product object; The product # # (classification fields available if Param('useclassification') is enabled:) # - # classification: string; The name of the classification the product is in - # - # class_description: string; Classification description, may be empty - # - # bug_count: number; The number of bugs belonging to the product - # - # milestoneurl: string; milestone url, if milestones are in use, - # may be empty - # - # disallownew: boolean; Are new bugs allowed for the product flag - # - # components: list of hashes, members are: name, description - # - # versions: list of version values. - # - # milestones: list of milestone values. + # classification: Bugzilla::Classification object; The classification + # the product is in # #%] -[% title = BLOCK %]Delete Product '[% product_name FILTER html %]' +[% title = BLOCK %]Delete Product '[% product.name FILTER html %]' [% END %] [% PROCESS global/header.html.tmpl @@ -50,25 +34,12 @@ [% IF classification %] [% classification_url_part = BLOCK %]&classification= - [%- classification FILTER url_quote %] + [%- classification.name FILTER url_quote %] [%- END %] [% ELSE %] [% classification_url_part = "" %] [% END %] -[% UNLESS class_description %] - [% class_description = 'missing' %] -[% END %] -[% UNLESS prod_description %] - [% prod_description = 'missing' %] -[% END %] - -[% IF disallownew %] - [% disallownew = "closed" %] -[% ELSE %] - [% disallownew = "open" %] -[% END %] - @@ -78,37 +49,49 @@ [% IF Param('useclassification') %] - + [%# descriptions are intentionally not filtered to allow html content %] - + [% END %] [%# descriptions are intentionally not filtered to allow html content %] - + [% IF Param('usetargetmilestone') %] - +
Field
Classification:[% classification FILTER html %][% classification.name FILTER html %]
Classification Description:[% class_description FILTER none %] + [% IF classification.description %] + [% classification.description FILTER none %] + [% ELSE %] + missing + [% END %] +
Product: - - [% product_name FILTER html %] + [% product.name FILTER html %]
Description:[% prod_description FILTER none %] + [% IF product.description %] + [% product.description FILTER none %] + [% ELSE %] + missing + [% END %] +
Milestone URL: - [% IF milestoneurl %] - - [%- milestoneurl FILTER html %] + [% IF product.milestone_url %] + + [%- product.milestone_url FILTER html %] [% ELSE %] none @@ -119,15 +102,21 @@
Closed for [% terms.bugs %]:[% disallownew FILTER html %] + [% IF product.disallownew %] + closed + [% ELSE %] + open + [% END %] +
- [% IF components.size > 0 %] - + title="Edit components for product '[% product.name FILTER html %]'"> Components: [% ELSE %] @@ -135,9 +124,9 @@ [% END %] - [% IF components.size > 0 %] + [% IF product.components.size > 0 %] - [% FOREACH c = components %] + [% FOREACH c = product.components %] [%# descriptions are intentionally not filtered to allow html content %] @@ -159,8 +148,8 @@ - + [% END %] diff --git a/template/en/default/admin/products/edit.html.tmpl b/template/en/default/admin/products/edit.html.tmpl index 15843bb44..089ce4c8d 100644 --- a/template/en/default/admin/products/edit.html.tmpl +++ b/template/en/default/admin/products/edit.html.tmpl @@ -17,13 +17,14 @@ #%] [%# INTERFACE: - # classification: string; name of classification product is in. - # product: an array of product objects. - # components: an array of component object(s) related to the product. - # groups: an array of group objects related to the product. - # versions: an array of version objects related to product. - # milestones: an array of milestones objects related to product. - # bug_count: integer; number of bugs in this product. + # product: Bugzilla::Product object; The product + # + # (classification fields available if Param('useclassification') is enabled:) + # + # classification: Bugzilla::Classification object; The classification + # the product is in + # + # groups_controls: a hash of group controls related to the product. #%] [% title = BLOCK %]Edit Product[% END %] @@ -44,8 +45,8 @@ - +
[% c.name FILTER html %]:
- [% IF versions.size > 0 %] - Versions: @@ -168,9 +157,9 @@ Versions: [% END %] - [% IF versions.size > 0 %] - [% FOREACH v = versions %] - [% v FILTER html %]
+ [% IF product.versions.size > 0 %] + [% FOREACH v = product.versions %] + [% v.name FILTER html %]
[% END %] [% ELSE %] none @@ -180,8 +169,8 @@
- [% IF milestones.size > 0 %] - Milestones: @@ -190,9 +179,9 @@ [% END %] - [% IF milestones.size > 0 %] - [% FOREACH m = milestones %] - [% m FILTER html %]
+ [% IF product.milestones.size > 0 %] + [% FOREACH m = product.milestones %] + [% m.name FILTER html %]
[% END %] [% ELSE %] none @@ -203,12 +192,12 @@
[% terms.Bugs %]: - [% IF bug_count %] - - [% bug_count %] + [%- product.name FILTER html %]'"> + [% product.bug_count FILTER html %] [% ELSE %] none @@ -219,21 +208,21 @@

Confirmation

-[% IF bug_count %] +[% IF product.bug_count %] [% IF !Param("allowbugdeletion") %] Sorry, there - [% IF bug_count > 1 %] - are [% bug_count %] [%+ terms.bugs %] + [% IF product.bug_count > 1 %] + are [% product.bug_count FILTER html %] [%+ terms.bugs %] [% ELSE %] is 1 [% terms.bug %] [% END %] outstanding for this product. You must reassign - [% IF bug_count > 1 %] + [% IF product.bug_count > 1 %] those [% terms.bugs %] [% ELSE %] that [% terms.bug %] @@ -247,8 +236,8 @@
There - [% IF bug_count > 1 %] - are [% bug_count %] [%+ terms.bugs %] + [% IF product.bug_count > 1 %] + are [% product.bug_count FILTER html %] [%+ terms.bugs %] [% ELSE %] is 1 [% terms.bug %] [% END %] @@ -263,16 +252,16 @@ [% END %] -[% IF bug_count == 0 || Param('allowbugdeletion') %] +[% IF product.bug_count == 0 || Param('allowbugdeletion') %]

Do you really want to delete this product?

- + + value="[% classification.name FILTER html %]">
[% END %] diff --git a/template/en/default/admin/products/create.html.tmpl b/template/en/default/admin/products/create.html.tmpl index 8dc6615b4..dc60299b8 100644 --- a/template/en/default/admin/products/create.html.tmpl +++ b/template/en/default/admin/products/create.html.tmpl @@ -15,8 +15,9 @@ #%] [%# INTERFACE: - # classification: string; name of the classification in which the new - # product is created. + # classification: Bugzilla::Classification object; If classifications + # are enabled, then this is + # the currently selected classification # #%] @@ -56,9 +57,11 @@ + value="[% classification.name FILTER html %]"> -[% PROCESS "admin/products/footer.html.tmpl" no_add_product_link = 1 %] +[% PROCESS "admin/products/footer.html.tmpl" + no_add_product_link = 1 + no_edit_product_link = 1 %] [% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/admin/products/created.html.tmpl b/template/en/default/admin/products/created.html.tmpl index e4229f8a2..f19854200 100644 --- a/template/en/default/admin/products/created.html.tmpl +++ b/template/en/default/admin/products/created.html.tmpl @@ -14,18 +14,23 @@ # Contributor(s): Gabriel S. Oliveira #%] +[%# INTERFACE: + # product: Bugzilla::Product object; the Product created. + # + #%] + [% PROCESS global/header.html.tmpl title = 'New Product Created' %]
You will need to - + add at least one component before you can enter [% terms.bugs %] against this product
-[% PROCESS "admin/products/footer.html.tmpl" name = product %] +[% PROCESS "admin/products/footer.html.tmpl" %] [% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/admin/products/deleted.html.tmpl b/template/en/default/admin/products/deleted.html.tmpl index 3252f97c9..049bcae0b 100644 --- a/template/en/default/admin/products/deleted.html.tmpl +++ b/template/en/default/admin/products/deleted.html.tmpl @@ -15,11 +15,16 @@ # #%] +[%# INTERFACE: + # product: Bugzilla::Product object; The product + # + #%] + [% PROCESS global/header.html.tmpl title = 'Deleting product' %] -[% IF nb_bugs %] +[% IF product.bug_count %] All references to deleted [% terms.bugs %] removed. [% END %] @@ -35,7 +40,7 @@

- Product [% product FILTER html %] deleted. + Product [% product.name FILTER html %] deleted.

[% PROCESS admin/products/footer.html.tmpl diff --git a/template/en/default/admin/products/edit-common.html.tmpl b/template/en/default/admin/products/edit-common.html.tmpl index cbbbd8232..f6b0d53ce 100644 --- a/template/en/default/admin/products/edit-common.html.tmpl +++ b/template/en/default/admin/products/edit-common.html.tmpl @@ -17,14 +17,15 @@ #%] [%# INTERFACE: - # classification: string; name of classification product is in. - # product: array; an array of product objects. + # product: Bugzilla::Product object; The product + # + # classification: Bugzilla::Classifiation object; classification product is in. #%] [% IF Param('useclassification') %]
Classification:[% classification FILTER html %][% classification.name FILTER html %]
- [% IF components.size -%] - [% FOREACH component = components %] + [% IF product.components.size -%] + [% FOREACH component = product.components %] [% component.name FILTER html %]:  [% IF component.description %] [% component.description FILTER none %] @@ -65,9 +66,9 @@ versions: - [%- IF versions.size -%] - [% FOREACH v = versions %] - [% v FILTER html %] + [%- IF product.versions.size -%] + [% FOREACH v = product.versions %] + [% v.name FILTER html %]
[% END %] [% ELSE %] @@ -82,9 +83,9 @@ versions: Edit milestones: 		- [%- IF milestones.size -%] - [%- FOREACH m = milestones -%] - [% m FILTER html %] + [%- IF product.milestones.size -%] + [%- FOREACH m = product.milestones -%] + [% m.name FILTER html %]
[% END %] [% ELSE %] @@ -97,15 +98,15 @@ versions: 		+ [%- classification.name FILTER url_quote %]"> Edit Group Access Controls: - [% IF groups.size %] - [% FOREACH g = groups %] - [% g.name FILTER html %]:  - [% IF g.isactive %] + [% IF group_controls.size %] + [% FOREACH g = group_controls.values %] + [% g.group.name FILTER html %]:  + [% IF g.group.isactive %] [% g.membercontrol FILTER html %]/ [% g.othercontrol FILTER html %] [% IF g.entry %], ENTRY[% END %] @@ -122,32 +123,21 @@ versions:
[% terms.Bugs %]:[% bug_count FILTER html %] + [% product.bug_count FILTER html %]
- - - - - - - - + value="[% classification.name FILTER html %]"> -[% PROCESS "admin/products/footer.html.tmpl" no_add_product_link = 1 %] +[% PROCESS "admin/products/footer.html.tmpl" + no_add_product_link = 1 + no_edit_product_link = 1 %] [% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/admin/products/footer.html.tmpl b/template/en/default/admin/products/footer.html.tmpl index 531e6c48e..480868abd 100644 --- a/template/en/default/admin/products/footer.html.tmpl +++ b/template/en/default/admin/products/footer.html.tmpl @@ -15,10 +15,11 @@ #%] [%# INTERFACE: - # name: string; the name of the product + # product: Bugzilla::Product Object; the product # - # classification: string; If classifications are enabled, then this is - # the currently selected classification + # classification: Bugzilla::Classification object ; If classifications + # are enabled, then this is the currently + # selected classification # # no_XXX_link: boolean; if defined, then don't show the corresponding # link. Supported parameters are: @@ -30,13 +31,13 @@ [% IF Param('useclassification') && classification %] [% classification_url_part = BLOCK %]&classification= - [%- classification FILTER url_quote %] + [%- classification.name FILTER url_quote %] [% END %] [% classification_url_part_start = BLOCK %]classification= - [%- classification FILTER url_quote %] + [%- classification.name FILTER url_quote %] [% END %] [% classification_text = BLOCK %] - of classification '[% classification FILTER html %]' + of classification '[% classification.name FILTER html %]' [% END %] [% END %] @@ -51,20 +52,22 @@ classification if they are enabled, but I'm just being paranoid %] [% IF Param('useclassification') && classification %] (to - classification '[% classification FILTER html %]') + classification '[% classification.name FILTER html %]' + ) [% END %]. [% END %] -[% IF name && !no_edit_product_link %] +[% IF product && !no_edit_product_link %] Edit product - '[% name FILTER html %]'. + [%- product.name FILTER url_quote %] + [%- classification_url_part %]"> + '[% product.name FILTER html %]'. [% END %] @@ -80,7 +83,7 @@ [% IF Param('useclassification') && classification %] Edit classification ' - [%- classification FILTER html %]'. + [%- classification.name FILTER html %]'. [% END %] diff --git a/template/en/default/admin/products/groupcontrol/confirm-edit.html.tmpl b/template/en/default/admin/products/groupcontrol/confirm-edit.html.tmpl index 006189c13..f8d55c397 100644 --- a/template/en/default/admin/products/groupcontrol/confirm-edit.html.tmpl +++ b/template/en/default/admin/products/groupcontrol/confirm-edit.html.tmpl @@ -21,9 +21,11 @@ #%] [% PROCESS global/variables.none.tmpl %] +[% title = BLOCK %] + Confirm Group Control Change for product '[%- product.name FILTER html %]' +[% END %] -[% PROCESS global/header.html.tmpl title="Confirm Group Control Change for product \'$product\'" %] - +[% PROCESS global/header.html.tmpl title = title %] [% FOREACH group = mandatory_groups %]

group '[% group.name FILTER html %]' impacts [% group.count %] diff --git a/template/en/default/admin/products/groupcontrol/edit.html.tmpl b/template/en/default/admin/products/groupcontrol/edit.html.tmpl index 4f13e6f22..174d15869 100644 --- a/template/en/default/admin/products/groupcontrol/edit.html.tmpl +++ b/template/en/default/admin/products/groupcontrol/edit.html.tmpl @@ -21,16 +21,18 @@ [% PROCESS global/variables.none.tmpl %] -[% filt_product = product FILTER html %] -[% filt_classification = classification FILTER html %] -[% PROCESS global/header.html.tmpl - title = "Edit Group Controls for '$filt_product'" +[% title = BLOCK %] + Edit Group Controls for [% product.name FILTER html %] +[% END %] +[% PROCESS global/header.html.tmpl + title = title %]

- - + + diff --git a/template/en/default/admin/products/groupcontrol/updated.html.tmpl b/template/en/default/admin/products/groupcontrol/updated.html.tmpl index 71ae0d7eb..5719bc6e6 100644 --- a/template/en/default/admin/products/groupcontrol/updated.html.tmpl +++ b/template/en/default/admin/products/groupcontrol/updated.html.tmpl @@ -18,12 +18,12 @@ [%# INTERFACE: # removed_na: array of hashes; groups not applicable for the product. # added_mandatory: array of hashes; groups mandatory for the product. - # classification: string; product classification name. - # product: string; name of the product. + # classification: Bugzilla::Classification object; product classification. + # product: Bugzilla::Product object; the product. #%] [% title = BLOCK %] - Update group access controls for [% product FILTER html %] + Update group access controls for [% product.name FILTER html %] [% END %] [% PROCESS global/header.html.tmpl @@ -48,6 +48,6 @@ Group control updates done

-[% PROCESS admin/products/footer.html.tmpl name = product %] +[% PROCESS admin/products/footer.html.tmpl %] [% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/admin/products/list.html.tmpl b/template/en/default/admin/products/list.html.tmpl index 98676e198..17eb61c0d 100644 --- a/template/en/default/admin/products/list.html.tmpl +++ b/template/en/default/admin/products/list.html.tmpl @@ -15,19 +15,10 @@ #%] [%# INTERFACE: - # products: array of hashes having the following properties: - # - name: string; The name of the product - # - description: string; The product description (html allowed) - # - status: boolean; Can new bugs be created for the product? - # - votesperuser: number; The number of votes a user is allowed - # in the product - # - maxvotersperbug: number; Maximum votes allowed per bug in this - # product - # - votestoconfirm: number; The number of votes that are needed to - # auto-confirm a bug in this product - # - bug_count: number; The number of bugs in this product + # products: array of Bugzilla::Product objects # - # classification: string; If classifications are enabled, then this is + # classification: Bugzilla::Classification object; If classifications + # are enabled, then this is # the currently selected classification #%] @@ -35,10 +26,10 @@ [% IF classification %] [% classification_url_part = BLOCK %]&classification= - [%- classification FILTER url_quote %] + [%- classification.name FILTER url_quote %] [%- END %] [% classification_title = BLOCK %] - in classification '[% classification FILTER html %]' + in classification '[% classification.name FILTER html %]' [% END %] [% END %] @@ -54,7 +45,7 @@ editproducts.cgi?action=del&product=%%name%% [%- classification_url_part %] [% END %] -[% bug_count_contentlink = BLOCK %]buglist.cgi?product=%%name%%& +[% bug_count_contentlink = BLOCK %]buglist.cgi?product=%%name%% [%- classification_url_part %][% END %] @@ -70,9 +61,8 @@ allow_html_content => 1 }, { - name => "status" + name => "disallow_new" heading => "Open For New $terms.Bugs" - yesno_field => 1 }, { name => "votesperuser" @@ -95,15 +85,27 @@ align => 'right' contentlink => bug_count_contentlink }, + { + heading => "Action" + content => "Delete" + contentlink => delete_contentlink + }, ] %] -[% columns.push({ - heading => "Action" - content => "Delete" - contentlink => delete_contentlink - }) -%] +[% overrides.disallow_new = [ { + match_value => "1" + match_field => 'disallow_new' + override_content => 1 + content => "No" + }, + { + match_value => 0 + match_field => 'disallow_new' + override_content => 1 + content => "Yes" + }] +%] [% PROCESS admin/table.html.tmpl columns = columns diff --git a/template/en/default/admin/products/updated.html.tmpl b/template/en/default/admin/products/updated.html.tmpl index 7c00c4ae5..993a27ed9 100644 --- a/template/en/default/admin/products/updated.html.tmpl +++ b/template/en/default/admin/products/updated.html.tmpl @@ -21,33 +21,10 @@ [%# INTERFACE: # - # updated_XXX : boolean; is true when the 'XXX' field has been updated. - # old_XXX : ... string; old value of the field 'XXX'. - # new_XXX : ... string; new value of the field 'XXX'. + # old_product : Bugzilla::Product Object; old product. + # product : Bugzilla::Product Object; new product. # - # updated_product: boolean; the name of the product was updated - # - # updated_description: boolean; the product description was updated - # - # updated_milestoneurl: boolean; the product milestone URL was updated - # - # updated_votesperuser: boolean; the votes per user was updated - # - # updated_maxvotesperbug: boolean; the max votes per bug was updated - # - # updated_votestoconfirm: boolean; the votes to confirm a bug was updated - # - # updated_defaultmilestone: boolean; the default milestone was updated - # - # updated_bugsubmitstatus: boolean; the open/closed for new bugs status - # was updated (no 'old_XXX' value) - # - # classification: string; The product classification (may be empty or missing) - # - # changer: string; user id of the user making the changes, used for mailing - # bug changes if necessary - # - # name: string; the product name + # classification: Bugzilla::Classification Object; The product classification (may be empty or missing) # # checkvotes: boolean; is true if vote related fields have changed. If so, # then the following parameters will be specified: @@ -62,105 +39,110 @@ # # confirmedbugs: list of bug ids, which were confirmed by votes # + # changer: string; user id of the user making the changes, used for mailing + # bug changes if necessary + # #%] [% IF classification %] [% classification_url_part = BLOCK %]&classification= - [%- classification FILTER url_quote %] + [%- classification.name FILTER url_quote %] [% END %] [% classification_text = BLOCK %] - of classification '[% classification FILTER html %]' + of classification '[% classification.name FILTER html %]' [% END %] [% END %] -[% title = BLOCK %]Updating Product '[% name FILTER html %]' +[% title = BLOCK %]Updating Product '[% product.name FILTER html %]' [% classification_text FILTER none %][% END %] [% PROCESS global/header.html.tmpl title = title style_urls = ['skins/standard/admin.css'] %] +[% updated = 0 %] -[% IF updated_product %] +[% IF product.name != old_product.name %]

- Updated product name from '[% old_product FILTER html %]' to + Updated product name from '[% old_product.name FILTER html %]' to [% new_product FILTER html %]. + [%- product.name FILTER url_quote %] + [%- classification_url_part FILTER none %]">[% product.name FILTER html %]. + [% updated = 1 %] [% END %] -[% IF updated_description %] +[% IF product.description != old_product.description %]

Updated description to:

-

[% new_description FILTER html %]

+

[% product.description FILTER html %]

+ [% updated = 1 %] [% END %] -[% IF updated_bugsubmitstatus %] +[% IF product.disallow_new != old_product.disallow_new %]

Product is now - [% IF new_bugsubmitstatus %] + [% IF product.disallow_new %] closed to [% ELSE %] open for [% END %] new [% terms.bugs %]. + [% updated = 1 %] [% END %] -[% IF updated_milestoneurl %] +[% IF product.milestone_url != old_product.milestone_url %]

Updated milestone URL - [% IF old_milestoneurl != '' %] - from
' - [%- old_milestoneurl FILTER html %]' + [% IF old_product.milestone_url != '' %] + from
' + [%- old_product.milestone_url FILTER html %]' [% END %] to - [% IF new_milestoneurl != '' %] -
' - [%- new_milestoneurl FILTER html %]'. + [% IF product.milestone_url != '' %] +
' + [%- product.milestone_url FILTER html %]'. [% ELSE %] be empty. [% END %]

+ [% updated = 1 %] [% END %] -[% IF updated_defaultmilestone %] +[% IF product.default_milestone != old_product.default_milestone %]

- Updated default milestone from '[% old_defaultmilestone FILTER html %]' to - '[% new_defaultmilestone FILTER html %]'. + Updated default milestone from '[% old_product.default_milestone FILTER html %]' to + '[% product.default_milestone FILTER html %]'.

+ [% updated = 1 %] [% END %] -[% IF updated_votesperuser %] +[% IF product.votes_per_user != old_product.votes_per_user %]

Updated votes per user from - [%+ old_votesperuser FILTER html %] to - [%+ new_votesperuser FILTER html %]. + [%+ old_product.votes_per_user FILTER html %] to + [%+ product.votes_per_user FILTER html %]. + [% updated = 1 %] [% END %] -[% IF updated_maxvotesperbug %] +[% IF product.max_votes_per_bug != old_product.max_votes_per_bug %]

Updated maximum votes per [% terms.bug %] from - [%+ old_maxvotesperbug FILTER html %] to - [%+ new_maxvotesperbug FILTER html %]. + [%+ old_product.max_votes_per_bug FILTER html %] to + [%+ product.max_votes_per_bug FILTER html %]. + [% updated = 1 %] [% END %] -[% IF updated_votestoconfirm %] +[% IF product.votes_to_confirm != old_product.votes_to_confirm %]

Updated number of votes needed to confirm a [% terms.bug %] from - [%+ old_votestoconfirm FILTER html %] to - [%+ new_votestoconfirm FILTER html %]. + [%+ old_product.votes_to_confirm FILTER html %] to + [%+ product.votes_to_confirm FILTER html %]. + [% updated = 1 %] [% END %] -[% UNLESS updated_bugsubmitstatus || - updated_description || - updated_milestoneurl || - updated_votesperuser || - updated_maxvotesperbug || - updated_votestoconfirm || - updated_defaultmilestone || - updated_product %] -

Nothing changed for product '[% name FILTER html %]'. +[% UNLESS updated %] +

Nothing changed for product '[% product.name FILTER html %]'. [% END %] [%# Note that this display of changed votes and/or confirmed bugs is diff --git a/template/en/default/filterexceptions.pl b/template/en/default/filterexceptions.pl index e0a811a48..eb0368c0c 100644 --- a/template/en/default/filterexceptions.pl +++ b/template/en/default/filterexceptions.pl @@ -506,8 +506,6 @@ ], 'admin/products/groupcontrol/edit.html.tmpl' => [ - 'filt_classification', - 'filt_product', 'group.bugcount', 'group.id', 'const.CONTROLMAPNA', @@ -522,7 +520,6 @@ 'admin/products/confirm-delete.html.tmpl' => [ 'classification_url_part', - 'bug_count', ], 'admin/products/footer.html.tmpl' => [ -- cgit v1.2.3-24-g4f1b