From a73890d2ef8851ddae6b4991998824596a0f5644 Mon Sep 17 00:00:00 2001 From: "mkanat%bugzilla.org" <> Date: Thu, 17 Dec 2009 23:31:51 +0000 Subject: Bug 162060: Remove the relationship between "votestoconfirm" and whether or not the UNCONFIRMED status is available, by adding a checkbox to enable the UNCONFIRMED status in editproducts.cgi. Patch by Max Kanat-Alexander r=LpSolit, a=LpSolit --- .../en/default/admin/products/create.html.tmpl | 4 +- .../default/admin/products/edit-common.html.tmpl | 69 ++++++++++++---------- template/en/default/admin/products/edit.html.tmpl | 1 + .../en/default/admin/products/updated.html.tmpl | 20 +++++++ 4 files changed, 61 insertions(+), 33 deletions(-) (limited to 'template/en/default/admin') diff --git a/template/en/default/admin/products/create.html.tmpl b/template/en/default/admin/products/create.html.tmpl index 664564040..f4a2161aa 100644 --- a/template/en/default/admin/products/create.html.tmpl +++ b/template/en/default/admin/products/create.html.tmpl @@ -25,15 +25,17 @@ [% PROCESS global/header.html.tmpl title = title style_urls = ['skins/standard/admin.css'] + javascript_urls = ['js/util.js'] %] [% DEFAULT product.votesperuser = "0", product.maxvotesperbug = "10000", - product.votestoconfirm = "0", + product.votes_to_confirm = "0", product.is_active = 1, version = "unspecified", product.defaultmilestone = constants.DEFAULT_MILESTONE + product.allows_unconfirmed = 0 %]
diff --git a/template/en/default/admin/products/edit-common.html.tmpl b/template/en/default/admin/products/edit-common.html.tmpl index 67dd5ae64..2c94402d6 100644 --- a/template/en/default/admin/products/edit-common.html.tmpl +++ b/template/en/default/admin/products/edit-common.html.tmpl @@ -69,39 +69,44 @@ [% ' checked="checked"' IF product.is_active %]> - -[% IF !Param('usevotes') %] - - - The 'usevotes' parameter is currently 'off'. These voting - settings will take effect when the parameter is next enabled. - -[% END %] - - Maximum votes per person: - - - - - - Maximum votes a person can put on a single [% terms.bug %]: - - - - - + - Confirmation threshold: + - - Enter the number of votes [% terms.abug %] in this product needs to - automatically get out of the - [% display_value("bug_status", "UNCONFIRMED") FILTER html %] - state.
- + + [% IF Param('usevotes') %] + + ...and automatically confirm [% terms.bugs %] if they get + + votes. (Setting this to 0 disables auto-confirming [% terms.bugs %] + by vote.) + + [% END %] + +[% IF Param('usevotes') %] + + Maximum votes per person: + + + + + + Maximum votes a person can put on a single [% terms.bug %]: + + + + +[% END %] diff --git a/template/en/default/admin/products/edit.html.tmpl b/template/en/default/admin/products/edit.html.tmpl index e6480c453..976739f78 100644 --- a/template/en/default/admin/products/edit.html.tmpl +++ b/template/en/default/admin/products/edit.html.tmpl @@ -29,6 +29,7 @@ [% PROCESS global/header.html.tmpl title = title style_urls = ['skins/standard/admin.css'] + javascript_urls = ['js/util.js'] %] [% group_control = {${constants.CONTROLMAPNA} => 'NA', diff --git a/template/en/default/admin/products/updated.html.tmpl b/template/en/default/admin/products/updated.html.tmpl index 594f84327..6e484ff34 100644 --- a/template/en/default/admin/products/updated.html.tmpl +++ b/template/en/default/admin/products/updated.html.tmpl @@ -39,6 +39,8 @@ style_urls = ['skins/standard/admin.css'] %] +[% PROCESS "global/field-descs.none.tmpl" %] + [% IF changes.name.defined %]

Updated product name from '[% changes.name.0 FILTER html %]' to @@ -101,6 +103,24 @@ [% checkvotes = 1 %] [% END %] +[% IF changes.allows_unconfirmed.defined %] +

+ [% IF product.allows_unconfirmed %] + The product now allows the + [%+ display_value('bug_status', 'UNCONFIRMED') FILTER html %] status. + [% ELSE %] + The product no longer allows the + [%+ display_value('bug_status', 'UNCONFIRMED') FILTER html %] status. + Note that any + + [%- terms.bugs %] that currently have the + [%+ display_value('bug_status', 'UNCONFIRMED') FILTER html %] status + will remain in that status until they are edited. + [% END %] +

+[% END %] + [% IF !changes.keys.size %]

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

[% END %] -- cgit v1.2.3-24-g4f1b