summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlpsolit%gmail.com <>2006-03-02 07:10:22 +0100
committerlpsolit%gmail.com <>2006-03-02 07:10:22 +0100
commitbf646df2bc21afc10dc0b074b13c8742ef43d461 (patch)
tree6e9955da4b5d96e907f5858e93ed4b7e07cdee54
parent6efc4495cf42c61f31397374618ea55bd31a9983 (diff)
downloadbugzilla-bf646df2bc21afc10dc0b074b13c8742ef43d461.tar.gz
bugzilla-bf646df2bc21afc10dc0b074b13c8742ef43d461.tar.xz
Bug 311258: use objects in admin templates (products & co) - Patch by André Batosti <batosti@async.com.br> r=LpSolit a=justdave
-rwxr-xr-xeditcomponents.cgi35
-rwxr-xr-xeditmilestones.cgi53
-rwxr-xr-xeditversions.cgi31
-rw-r--r--template/en/default/admin/components/confirm-delete.html.tmpl25
-rw-r--r--template/en/default/admin/components/create.html.tmpl9
-rw-r--r--template/en/default/admin/components/created.html.tmpl13
-rw-r--r--template/en/default/admin/components/deleted.html.tmpl26
-rw-r--r--template/en/default/admin/components/edit.html.tmpl10
-rw-r--r--template/en/default/admin/components/footer.html.tmpl23
-rw-r--r--template/en/default/admin/components/list.html.tmpl22
-rw-r--r--template/en/default/admin/components/updated.html.tmpl29
-rw-r--r--template/en/default/admin/milestones/confirm-delete.html.tmpl35
-rw-r--r--template/en/default/admin/milestones/create.html.tmpl9
-rw-r--r--template/en/default/admin/milestones/created.html.tmpl16
-rw-r--r--template/en/default/admin/milestones/deleted.html.tmpl22
-rw-r--r--template/en/default/admin/milestones/edit.html.tmpl21
-rw-r--r--template/en/default/admin/milestones/footer.html.tmpl26
-rw-r--r--template/en/default/admin/milestones/list.html.tmpl18
-rw-r--r--template/en/default/admin/milestones/updated.html.tmpl20
-rw-r--r--template/en/default/admin/versions/confirm-delete.html.tmpl39
-rw-r--r--template/en/default/admin/versions/create.html.tmpl9
-rw-r--r--template/en/default/admin/versions/created.html.tmpl17
-rw-r--r--template/en/default/admin/versions/deleted.html.tmpl14
-rw-r--r--template/en/default/admin/versions/edit.html.tmpl17
-rw-r--r--template/en/default/admin/versions/footer.html.tmpl26
-rw-r--r--template/en/default/admin/versions/list.html.tmpl17
-rw-r--r--template/en/default/admin/versions/updated.html.tmpl16
-rw-r--r--template/en/default/filterexceptions.pl16
-rw-r--r--template/en/default/global/user-error.html.tmpl5
29 files changed, 295 insertions, 324 deletions
diff --git a/editcomponents.cgi b/editcomponents.cgi
index 3cbd71a9c..601873e83 100755
--- a/editcomponents.cgi
+++ b/editcomponents.cgi
@@ -96,8 +96,7 @@ $user->can_see_product($product->name)
unless ($action) {
$vars->{'showbugcounts'} = $showbugcounts;
- $vars->{'product'} = $product->name;
- $vars->{'components'} = $product->components;
+ $vars->{'product'} = $product;
$template->process("admin/components/list.html.tmpl", $vars)
|| ThrowTemplateError($template->error());
@@ -113,7 +112,7 @@ unless ($action) {
if ($action eq 'add') {
- $vars->{'product'} = $product->name;
+ $vars->{'product'} = $product;
$template->process("admin/components/create.html.tmpl", $vars)
|| ThrowTemplateError($template->error());
@@ -212,8 +211,12 @@ if ($action eq 'new') {
# Make versioncache flush
unlink "$datadir/versioncache";
- $vars->{'name'} = $comp_name;
- $vars->{'product'} = $product->name;
+ $component =
+ new Bugzilla::Component({product_id => $product->id,
+ name => $comp_name});
+
+ $vars->{'comp'} = $component;
+ $vars->{'product'} = $product;
$template->process("admin/components/created.html.tmpl",
$vars)
|| ThrowTemplateError($template->error());
@@ -234,7 +237,7 @@ if ($action eq 'del') {
$vars->{'comp'} =
Bugzilla::Component::check_component($product, $comp_name);
- $vars->{'prod'} = $product;
+ $vars->{'product'} = $product;
$template->process("admin/components/confirm-delete.html.tmpl", $vars)
|| ThrowTemplateError($template->error());
@@ -264,9 +267,7 @@ if ($action eq 'delete') {
{nb => $component->bug_count });
}
}
-
- $vars->{'deleted_bug_count'} = $component->bug_count;
-
+
$dbh->bz_lock_tables('components WRITE', 'flaginclusions WRITE',
'flagexclusions WRITE');
@@ -281,8 +282,8 @@ if ($action eq 'delete') {
unlink "$datadir/versioncache";
- $vars->{'name'} = $component->name;
- $vars->{'product'} = $product->name;
+ $vars->{'comp'} = $component;
+ $vars->{'product'} = $product;
$template->process("admin/components/deleted.html.tmpl", $vars)
|| ThrowTemplateError($template->error());
exit;
@@ -301,7 +302,7 @@ if ($action eq 'edit') {
$vars->{'comp'} =
Bugzilla::Component::check_component($product, $comp_name);
- $vars->{'prod'} = $product;
+ $vars->{'product'} = $product;
$template->process("admin/components/edit.html.tmpl",
$vars)
@@ -379,7 +380,6 @@ if ($action eq 'update') {
undef, ($description, $component_old->id));
$vars->{'updated_description'} = 1;
- $vars->{'description'} = $description;
}
if ($default_assignee ne $component_old->default_assignee->login) {
@@ -388,8 +388,6 @@ if ($action eq 'update') {
undef, ($default_assignee_id, $component_old->id));
$vars->{'updated_initialowner'} = 1;
- $vars->{'initialowner'} = $default_assignee;
-
}
if (Param('useqacontact')
@@ -399,13 +397,14 @@ if ($action eq 'update') {
($default_qa_contact_id, $component_old->id));
$vars->{'updated_initialqacontact'} = 1;
- $vars->{'initialqacontact'} = $default_qa_contact;
}
$dbh->bz_unlock_tables();
- $vars->{'name'} = $comp_name;
- $vars->{'product'} = $product->name;
+ my $component = new Bugzilla::Component($component_old->id);
+
+ $vars->{'comp'} = $component;
+ $vars->{'product'} = $product;
$template->process("admin/components/updated.html.tmpl",
$vars)
|| ThrowTemplateError($template->error());
diff --git a/editmilestones.cgi b/editmilestones.cgi
index 4a17cdc18..8d9cbe973 100755
--- a/editmilestones.cgi
+++ b/editmilestones.cgi
@@ -84,9 +84,7 @@ $user->can_see_product($product->name)
unless ($action) {
$vars->{'showbugcounts'} = $showbugcounts;
- $vars->{'product'} = $product->name;
- $vars->{'milestones'} = $product->milestones;
- $vars->{'default_milestone'} = $product->default_milestone;
+ $vars->{'product'} = $product;
$template->process("admin/milestones/list.html.tmpl",
$vars)
|| ThrowTemplateError($template->error());
@@ -105,7 +103,7 @@ unless ($action) {
if ($action eq 'add') {
- $vars->{'product'} = $product->name;
+ $vars->{'product'} = $product;
$template->process("admin/milestones/create.html.tmpl",
$vars)
|| ThrowTemplateError($template->error());
@@ -149,8 +147,10 @@ if ($action eq 'new') {
# Make versioncache flush
unlink "$datadir/versioncache";
- $vars->{'name'} = $milestone_name;
- $vars->{'product'} = $product->name;
+ $milestone = new Bugzilla::Milestone($product->id,
+ $milestone_name);
+ $vars->{'milestone'} = $milestone;
+ $vars->{'product'} = $product;
$template->process("admin/milestones/created.html.tmpl",
$vars)
|| ThrowTemplateError($template->error());
@@ -171,16 +171,14 @@ if ($action eq 'del') {
my $milestone = Bugzilla::Milestone::check_milestone($product,
$milestone_name);
- $vars->{'name'} = $milestone->name;
- $vars->{'product'} = $product->name;
+ $vars->{'milestone'} = $milestone;
+ $vars->{'product'} = $product;
# The default milestone cannot be deleted.
if ($product->default_milestone eq $milestone->name) {
ThrowUserError("milestone_is_default", $vars);
}
- $vars->{'bug_count'} = $milestone->bug_count;
-
$template->process("admin/milestones/confirm-delete.html.tmpl", $vars)
|| ThrowTemplateError($template->error());
exit;
@@ -197,23 +195,21 @@ if ($action eq 'delete') {
my $milestone =
Bugzilla::Milestone::check_milestone($product,
$milestone_name);
- $vars->{'name'} = $milestone->name;
- $vars->{'product'} = $product->name;
+ $vars->{'milestone'} = $milestone;
+ $vars->{'product'} = $product;
# The default milestone cannot be deleted.
if ($milestone->name eq $product->default_milestone) {
ThrowUserError("milestone_is_default", $vars);
}
- # We don't want to delete bugs when deleting a milestone.
- # Bugs concerned are reassigned to the default milestone.
- my $bug_ids =
- $dbh->selectcol_arrayref("SELECT bug_id FROM bugs
- WHERE product_id = ? AND target_milestone = ?",
- undef, ($product->id, $milestone->name));
-
- my $nb_bugs = scalar(@$bug_ids);
- if ($nb_bugs) {
+ if ($milestone->bug_count) {
+ # We don't want to delete bugs when deleting a milestone.
+ # Bugs concerned are reassigned to the default milestone.
+ my $bug_ids =
+ $dbh->selectcol_arrayref("SELECT bug_id FROM bugs
+ WHERE product_id = ? AND target_milestone = ?",
+ undef, ($product->id, $milestone->name));
my $timestamp = $dbh->selectrow_array("SELECT NOW()");
foreach my $bug_id (@$bug_ids) {
$dbh->do("UPDATE bugs SET target_milestone = ?,
@@ -228,8 +224,6 @@ if ($action eq 'delete') {
}
}
- $vars->{'bug_count'} = $nb_bugs;
-
$dbh->do("DELETE FROM milestones WHERE product_id = ? AND value = ?",
undef, ($product->id, $milestone->name));
@@ -254,9 +248,8 @@ if ($action eq 'edit') {
Bugzilla::Milestone::check_milestone($product,
$milestone_name);
- $vars->{'sortkey'} = $milestone->sortkey;
- $vars->{'name'} = $milestone->name;
- $vars->{'product'} = $product->name;
+ $vars->{'milestone'} = $milestone;
+ $vars->{'product'} = $product;
$template->process("admin/milestones/edit.html.tmpl",
$vars)
@@ -301,7 +294,6 @@ if ($action eq 'update') {
unlink "$datadir/versioncache";
$vars->{'updated_sortkey'} = 1;
- $vars->{'sortkey'} = $sortkey;
}
if ($milestone_name ne $milestone_old->name) {
@@ -352,8 +344,11 @@ if ($action eq 'update') {
$dbh->bz_unlock_tables();
- $vars->{'name'} = $milestone_name;
- $vars->{'product'} = $product->name;
+ my $milestone =
+ Bugzilla::Milestone::check_milestone($product,
+ $milestone_name);
+ $vars->{'milestone'} = $milestone;
+ $vars->{'product'} = $product;
$template->process("admin/milestones/updated.html.tmpl",
$vars)
|| ThrowTemplateError($template->error());
diff --git a/editversions.cgi b/editversions.cgi
index be2c8a3c6..dc6992ba8 100755
--- a/editversions.cgi
+++ b/editversions.cgi
@@ -91,8 +91,7 @@ $user->can_see_product($product->name)
unless ($action) {
$vars->{'showbugcounts'} = $showbugcounts;
- $vars->{'product'} = $product->name;
- $vars->{'versions'} = $product->versions;
+ $vars->{'product'} = $product;
$template->process("admin/versions/list.html.tmpl",
$vars)
|| ThrowTemplateError($template->error());
@@ -111,7 +110,7 @@ unless ($action) {
if ($action eq 'add') {
- $vars->{'product'} = $product->name;
+ $vars->{'product'} = $product;
$template->process("admin/versions/create.html.tmpl",
$vars)
|| ThrowTemplateError($template->error());
@@ -148,8 +147,9 @@ if ($action eq 'new') {
# Make versioncache flush
unlink "$datadir/versioncache";
- $vars->{'name'} = $version_name;
- $vars->{'product'} = $product->name;
+ $version = new Bugzilla::Version($product->id, $version_name);
+ $vars->{'version'} = $version;
+ $vars->{'product'} = $product;
$template->process("admin/versions/created.html.tmpl",
$vars)
|| ThrowTemplateError($template->error());
@@ -170,11 +170,9 @@ if ($action eq 'del') {
my $version = Bugzilla::Version::check_version($product,
$version_name);
- my $bugs = $version->bug_count;
- $vars->{'bug_count'} = $bugs;
- $vars->{'name'} = $version->name;
- $vars->{'product'} = $product->name;
+ $vars->{'version'} = $version;
+ $vars->{'product'} = $product;
$template->process("admin/versions/confirm-delete.html.tmpl",
$vars)
|| ThrowTemplateError($template->error());
@@ -205,8 +203,8 @@ if ($action eq 'delete') {
unlink "$datadir/versioncache";
- $vars->{'name'} = $version->name;
- $vars->{'product'} = $product->name;
+ $vars->{'version'} = $version;
+ $vars->{'product'} = $product;
$template->process("admin/versions/deleted.html.tmpl", $vars)
|| ThrowTemplateError($template->error());
@@ -226,8 +224,8 @@ if ($action eq 'edit') {
my $version = Bugzilla::Version::check_version($product,
$version_name);
- $vars->{'name'} = $version->name;
- $vars->{'product'} = $product->name;
+ $vars->{'version'} = $version;
+ $vars->{'product'} = $product;
$template->process("admin/versions/edit.html.tmpl",
$vars)
@@ -290,8 +288,11 @@ if ($action eq 'update') {
$dbh->bz_unlock_tables();
- $vars->{'name'} = $version_name;
- $vars->{'product'} = $product->name;
+ my $version =
+ Bugzilla::Version::check_version($product,
+ $version_name);
+ $vars->{'version'} = $version;
+ $vars->{'product'} = $product;
$template->process("admin/versions/updated.html.tmpl",
$vars)
|| ThrowTemplateError($template->error());
diff --git a/template/en/default/admin/components/confirm-delete.html.tmpl b/template/en/default/admin/components/confirm-delete.html.tmpl
index dabace154..a0387352b 100644
--- a/template/en/default/admin/components/confirm-delete.html.tmpl
+++ b/template/en/default/admin/components/confirm-delete.html.tmpl
@@ -22,11 +22,11 @@
[%# INTERFACE:
# comp: object; Bugzilla::Component object representing the component the
# user wants to delete.
- # prod: object; Bugzilla::Product object representing the product to
+ # product: object; Bugzilla::Product object representing the product to
# which the component belongs.
#%]
-[% title = BLOCK %]Delete Component of Product '[% prod.name FILTER html %]'
+[% title = BLOCK %]Delete Component of Product '[% product.name FILTER html %]'
[% END %]
[% PROCESS global/header.html.tmpl
@@ -60,13 +60,13 @@
</tr>
<tr>
<td valign="top">Component of Product:</td>
- <td valign="top">[% prod.name FILTER html %]</td>
+ <td valign="top">[% product.name FILTER html %]</td>
-[% IF prod.description %]
+[% IF product.description %]
</tr>
<tr>
<td valign="top">Product Description:</td>
- <td valign="top">[% prod.description FILTER html %]</td>
+ <td valign="top">[% product.description FILTER html %]</td>
[% END %]
[% IF Param('usetargetmilestone') %]
@@ -74,8 +74,8 @@
<tr>
<td valign="top">Product Milestone URL:</td>
<td valign="top">
- <a href="[% prod.milestone_url FILTER uri %]">
- [% prod.milestone_url FILTER html %]
+ <a href="[% product.milestone_url FILTER uri %]">
+ [% product.milestone_url FILTER html %]
</a>
</td>
[% END %]
@@ -83,7 +83,7 @@
</tr>
<tr>
<TD VALIGN="top">Closed for [% terms.bugs %]:</TD>
- <TD VALIGN="top">[% IF prod.disallow_new %]Yes[% ELSE %]No[% END %]</td>
+ <TD VALIGN="top">[% IF product.disallow_new %]Yes[% ELSE %]No[% END %]</td>
</tr>
<tr>
<td valign="top">[% terms.Bugs %]:</td>
@@ -91,7 +91,7 @@
[% IF comp.bug_count %]
<a title="List of [% terms.bugs %] for component '[% comp.name FILTER html %]'"
href="buglist.cgi?component=[% comp.name FILTER url_quote %]&amp;product=
- [%- prod.name FILTER url_quote %]">[% comp.bug_count %]</a>
+ [%- product.name FILTER url_quote %]">[% comp.bug_count %]</a>
[% ELSE %]
None
[% END %]
@@ -148,15 +148,12 @@
<form method="post" action="editcomponents.cgi">
<input type="submit" value="Yes, delete">
<input type="hidden" name="action" value="delete">
- <input type="hidden" name="product" value="[% prod.name FILTER html %]">
+ <input type="hidden" name="product" value="[% product.name FILTER html %]">
<input type="hidden" name="component" value="[% comp.name FILTER html %]">
</form>
[% END %]
-[% PROCESS admin/components/footer.html.tmpl
- name = comp.name
- product = prod.name
-%]
+[% PROCESS admin/components/footer.html.tmpl %]
[% PROCESS global/footer.html.tmpl %]
diff --git a/template/en/default/admin/components/create.html.tmpl b/template/en/default/admin/components/create.html.tmpl
index ea4380d50..fa4c05c14 100644
--- a/template/en/default/admin/components/create.html.tmpl
+++ b/template/en/default/admin/components/create.html.tmpl
@@ -20,12 +20,13 @@
#%]
[%# INTERFACE:
- # product: string; name of product
+ # product: object; Bugzilla::Product object representing the product to
+ # which the component belongs.
#%]
-[% title = BLOCK %]Add component to Product '[% product FILTER html %]'[% END %]
+[% title = BLOCK %]Add component to Product '[% product.name FILTER html %]'[% END %]
[% h2 = BLOCK %]This page allows you to add a new component to product
- '[% product FILTER html %]'.[% END %]
+ '[% product.name FILTER html %]'.[% END %]
[% PROCESS global/header.html.tmpl
title = title
h2 = h2
@@ -81,7 +82,7 @@
<input type="hidden" name="action" value="new">
<input type="hidden" name='open_name' value='All Open'>
<input type="hidden" name='nonopen_name' value='All Closed'>
- <input type="hidden" name='product' value="[% product FILTER html %]">
+ <input type="hidden" name='product' value="[% product.name FILTER html %]">
</form>
diff --git a/template/en/default/admin/components/created.html.tmpl b/template/en/default/admin/components/created.html.tmpl
index 54963065d..090cfd87e 100644
--- a/template/en/default/admin/components/created.html.tmpl
+++ b/template/en/default/admin/components/created.html.tmpl
@@ -20,20 +20,21 @@
#%]
[%# INTERFACE:
- # name: string; the name of the newly created component
- #
- # product: string; the name of the product the component belongs to
+ # comp: object; Bugzilla::Component object representing the component the
+ # user created.
+ # product: object; Bugzilla::Product object representing the product to
+ # which the component belongs.
#%]
[% title = BLOCK %]Adding new Component of Product
- '[% product FILTER html %]'[% END %]
+ '[% product.name FILTER html %]'[% END %]
[% PROCESS global/header.html.tmpl
title = title
%]
<p>The component '<a href="editcomponents.cgi?action=edit&amp;product=
- [%- product FILTER url_quote %]&amp;component=[% name FILTER url_quote %]">
- [%- name FILTER html %]</a>' has been created.</p>
+ [%- product.name FILTER url_quote %]&amp;component=[% comp.name FILTER url_quote %]">
+ [%- comp.name FILTER html %]</a>' has been created.</p>
[% PROCESS admin/components/footer.html.tmpl %]
diff --git a/template/en/default/admin/components/deleted.html.tmpl b/template/en/default/admin/components/deleted.html.tmpl
index 83c006869..2b89ac0f3 100644
--- a/template/en/default/admin/components/deleted.html.tmpl
+++ b/template/en/default/admin/components/deleted.html.tmpl
@@ -20,27 +20,25 @@
#%]
[%# INTERFACE:
- # name: string; the name of the deleted component.
- #
- # product: string; the name of the product the component belonged to
- #
- # deleted_bug_count: number; the number of bugs which were deleted
- # (if bug deletion is allowed)
+ # comp: object; Bugzilla::Component object representing the component the
+ # user deleted.
+ # product: object; Bugzilla::Product object representing the product to
+ # which the component belongs.
#%]
-[% title = BLOCK %]Deleted Component '[% name FILTER html %]' from Product
- '[% product FILTER html %]'[% END %]
+[% title = BLOCK %]Deleted Component '[% comp.name FILTER html %]' from Product
+ '[% product.name FILTER html %]'[% END %]
[% PROCESS global/header.html.tmpl
title = title
%]
<p>
-[% IF deleted_bug_count %]
- [% deleted_bug_count %]
- [%- IF deleted_bug_count > 1 %]
- [% terms.bugs %]
+[% IF comp.bug_count %]
+ [% comp.bug_count FILTER none %]
+ [%- IF comp.bug_count > 1 %]
+ [%+ terms.bugs %]
[% ELSE %]
- [% terms.bug %]
+ [%+ terms.bug %]
[% END %]
deleted.
</p><p>
@@ -52,7 +50,7 @@
<p>Flag inclusions and exclusions deleted.</p>
-<p>Component '[% name FILTER html %]' deleted.</p>
+<p>Component '[% comp.name FILTER html %]' deleted.</p>
[% PROCESS admin/components/footer.html.tmpl
no_edit_component_link = 1
diff --git a/template/en/default/admin/components/edit.html.tmpl b/template/en/default/admin/components/edit.html.tmpl
index 920ad1ff6..22b7295dd 100644
--- a/template/en/default/admin/components/edit.html.tmpl
+++ b/template/en/default/admin/components/edit.html.tmpl
@@ -22,7 +22,7 @@
[%# INTERFACE:
# comp: object; Bugzilla::Component object representing the component the
# user wants to edit.
- # prod: object; Bugzilla::Product object representing the product to
+ # product: object; Bugzilla::Product object representing the product to
# which the component belongs.
#%]
@@ -88,7 +88,7 @@
<a title="Bugs in component '[% comp.name FILTER html %]'"
href="buglist.cgi?component=
[%- comp.name FILTER url_quote %]&amp;product=
- [%- prod.name FILTER url_quote %]">[% comp.bug_count %]</a>
+ [%- product.name FILTER url_quote %]">[% comp.bug_count %]</a>
[% ELSE %]
None
[% END %]
@@ -99,18 +99,16 @@
<input type="hidden" name="action" value="update">
<input type="hidden" name="componentold" value="[% comp.name FILTER html %]">
- <input type="hidden" name="product" value="[% prod.name FILTER html %]">
+ <input type="hidden" name="product" value="[% product.name FILTER html %]">
<input type="submit" value="Update"> or <a
href="editcomponents.cgi?action=del&amp;product=
- [%- prod.name FILTER url_quote %]&amp;component=
+ [%- product.name FILTER url_quote %]&amp;component=
[%- comp.name FILTER url_quote %]">Delete</a> this component.
</form>
[% PROCESS admin/components/footer.html.tmpl
no_edit_component_link = 1
- name = comp.name
- product = prod.name
%]
[% PROCESS global/footer.html.tmpl %]
diff --git a/template/en/default/admin/components/footer.html.tmpl b/template/en/default/admin/components/footer.html.tmpl
index 1f58622ae..dfc720921 100644
--- a/template/en/default/admin/components/footer.html.tmpl
+++ b/template/en/default/admin/components/footer.html.tmpl
@@ -20,10 +20,9 @@
#%]
[%# INTERFACE:
- # name: string; the name of the component
- #
- # product: string; the name of the product which the component
- # belongs/belonged to
+ # comp: object; Bugzilla::Component object representing the component
+ # product: object; Bugzilla::Product object representing the product to
+ # which the component belongs.
#%]
<p>
@@ -31,26 +30,26 @@
<hr>
Edit
-[% IF name && !no_edit_component_link %]
+[% IF comp && !no_edit_component_link %]
component <a
- title="Edit Component '[% name FILTER html %]'"
+ title="Edit Component '[% comp.name FILTER html %]'"
href="editcomponents.cgi?action=edit&amp;product=
- [%- product FILTER url_quote %]&amp;component=[% name FILTER url_quote %]">
- '[% name FILTER html %]'</a>
+ [%- product.name FILTER url_quote %]&amp;component=[% comp.name FILTER url_quote %]">
+ '[% comp.name FILTER html %]'</a>
or edit
[% END %]
[% IF !no_edit_other_components_link %]
other components of product <a
- title="Choose a component from product '[% product FILTER html %]' to edit"
+ title="Choose a component from product '[% product.name FILTER html %]' to edit"
href="editcomponents.cgi?product=
- [%- product FILTER url_quote %]">'[% product FILTER html %]'</a>,
+ [%- product.name FILTER url_quote %]">'[% product.name FILTER html %]'</a>,
or edit
[% END %]
product <a
- title="Edit Product '[% product FILTER html %]'"
+ title="Edit Product '[% product.name FILTER html %]'"
href="editproducts.cgi?action=edit&amp;product=
- [%- product FILTER url_quote %]">'[% product FILTER html %]'</a>.
+ [%- product.name FILTER url_quote %]">'[% product.name FILTER html %]'</a>.
</p>
diff --git a/template/en/default/admin/components/list.html.tmpl b/template/en/default/admin/components/list.html.tmpl
index 0b4998679..c0862eb73 100644
--- a/template/en/default/admin/components/list.html.tmpl
+++ b/template/en/default/admin/components/list.html.tmpl
@@ -21,25 +21,25 @@
#%]
[%# INTERFACE:
- # components: array of component objects
# showbugcounts: if defined, then bug counts should be included in the table
- # product: string; the name of the product we are editing components for
+ # product: object; Bugzilla::Product object representing the product to
+ # which the component belongs.
#%]
[% PROCESS global/variables.none.tmpl %]
[% title = BLOCK %]Select component of product
- '[% product FILTER html %]'[% END %]
+ '[% product.name FILTER html %]'[% END %]
[% PROCESS global/header.html.tmpl
title = title
%]
[% edit_contentlink = BLOCK %]editcomponents.cgi?action=edit&amp;product=
- [%- product FILTER url_quote %]&amp;component=%%name%%[% END %]
+ [%- product.name FILTER url_quote %]&amp;component=%%name%%[% END %]
[% delete_contentlink = BLOCK %]editcomponents.cgi?action=del&amp;product=
- [%- product FILTER url_quote %]&amp;component=%%name%%[% END %]
+ [%- product.name FILTER url_quote %]&amp;component=%%name%%[% END %]
[% bug_count_contentlink = BLOCK %]buglist.cgi?component=%%name%%&amp;product=
- [%- product FILTER url_quote %][% END %]
+ [%- product.name FILTER url_quote %][% END %]
[% columns = [
@@ -90,7 +90,7 @@
[% overrides.initialowner = [] %]
[% overrides.initialqacontact = [] %]
-[% FOREACH component = components %]
+[% FOREACH component = product.components %]
[% overrides.initialowner.push({
match_value => component.name
match_field => 'name'
@@ -109,16 +109,16 @@
[% PROCESS admin/table.html.tmpl
columns = columns
- data = components
+ data = product.components
overrides = overrides
%]
-<p><a href="editcomponents.cgi?action=add&amp;product=[% product FILTER url_quote %]">Add</a>
- a new component to product '[% product FILTER html %]'</p>
+<p><a href="editcomponents.cgi?action=add&amp;product=[% product.name FILTER url_quote %]">Add</a>
+ a new component to product '[% product.name FILTER html %]'</p>
[% IF ! showbugcounts %]
- <p><a href="editcomponents.cgi?product=[% product FILTER url_quote %]&amp;showbugcounts=1">
+ <p><a href="editcomponents.cgi?product=[% product.name FILTER url_quote %]&amp;showbugcounts=1">
Redisplay table with [% terms.bug %] counts (slower)</a></p>
[% END %]
diff --git a/template/en/default/admin/components/updated.html.tmpl b/template/en/default/admin/components/updated.html.tmpl
index b4c4fea3c..e05bc0973 100644
--- a/template/en/default/admin/components/updated.html.tmpl
+++ b/template/en/default/admin/components/updated.html.tmpl
@@ -23,22 +23,23 @@
#
# 'updated_XXX' variables are booleans, and are defined if the
# 'XXX' field was updated during the edit just being handled.
- # Variables called just 'XXX' are strings, and are the _new_ contents
- # of the fields.
#
- # name & updated_name: the name of the component
+ # updated_name: the name of the component updated
#
- # description & updated_description: the component description
+ # updated_description: the component description updated
#
- # initialowner & updated_initialowner: the default assignee
+ # updated_initialowner: the default assignee updated
#
- # initialqacontact & updated_initialqacontact: the default qa contact
+ # updated_initialqacontact: the default qa contact updated
#
- # product: string; the name of the product the component belongs to
+ # comp: object; Bugzilla::Component object representing the component
+ # user updated.
+ # product: object; Bugzilla::Product object representing the product to
+ # which the component belongs.
#%]
-[% title = BLOCK %]Updating Component '[% name FILTER html %]' of Product
- '[% product FILTER html %]'[% END %]
+[% title = BLOCK %]Updating Component '[% comp.name FILTER html %]' of Product
+ '[% product.name FILTER html %]'[% END %]
[% PROCESS global/header.html.tmpl
title = title
%]
@@ -48,19 +49,19 @@
<table>
<tr>
<td>Updated description to:</td>
- <td>'[% description FILTER html %]'</td>
+ <td>'[% comp.description FILTER html %]'</td>
</tr>
</table>
[% END %]
[% IF updated_initialowner %]
- <p>Updated Default Assignee to: '[% initialowner FILTER html %]'.</p>
+ <p>Updated Default Assignee to: '[% comp.initialowner FILTER html %]'.</p>
[% END %]
[% IF updated_initialqacontact %]
<p>
[% IF initialqacontact %]
- Updated Default QA Contact to '[% initialqacontact FILTER html %]'.
+ Updated Default QA Contact to '[% comp.initialqacontact FILTER html %]'.
[% ELSE %]
Removed Default QA Contact.
[% END %]
@@ -68,12 +69,12 @@
[% END %]
[% IF updated_name %]
- <p>Updated Component name to: '[% name FILTER html %]'.</p>
+ <p>Updated Component name to: '[% comp.name FILTER html %]'.</p>
[% END %]
[% UNLESS updated_description || updated_initialowner ||
updated_initialqacontact || updated_name %]
- <p>Nothing changed for component '[% name FILTER html %]'.
+ <p>Nothing changed for component '[% comp.name FILTER html %]'.
[% END %]
diff --git a/template/en/default/admin/milestones/confirm-delete.html.tmpl b/template/en/default/admin/milestones/confirm-delete.html.tmpl
index 61601d185..6a7900e72 100644
--- a/template/en/default/admin/milestones/confirm-delete.html.tmpl
+++ b/template/en/default/admin/milestones/confirm-delete.html.tmpl
@@ -21,15 +21,13 @@
#%]
[%# INTERFACE:
- # name: string; The name of the milestone
- #
- # bug_count: number; The number of bugs targetted at the milestone
- #
- # product: string; The name of the product
- #
+ # product: object; Bugzilla::Product object representing the product to
+ # which the milestone belongs.
+ # milestone: object; Bugzilla::Milestone object representing the
+ # milestone the user wants to delete.
#%]
-[% title = BLOCK %]Delete Milestone of Product '[% product FILTER html %]'
+[% title = BLOCK %]Delete Milestone of Product '[% product.name FILTER html %]'
[% END %]
[% PROCESS global/header.html.tmpl
@@ -43,20 +41,21 @@
</tr>
<tr>
<td valign="top">Milestone:</td>
- <td valign="top">[% name FILTER html %]</td>
+ <td valign="top">[% milestone.name FILTER html %]</td>
</tr>
<tr>
<td valign="top">Milestone of Product:</td>
- <td valign="top">[% product FILTER html %]</td>
+ <td valign="top">[% product.name FILTER html %]</td>
</tr>
<tr>
<td valign="top">[% terms.Bugs %]:</td>
<td valign="top">
-[% IF bug_count %]
+[% IF milestone.bug_count %]
<a title="List of [% terms.bugs %] targetted at milestone '
- [% name FILTER html %]'"
- href="buglist.cgi?target_milestone=[% name FILTER url_quote %]&amp;product=
- [%- product FILTER url_quote %]">[% bug_count %]</a>
+ [% milestone.name FILTER html %]'"
+ href="buglist.cgi?target_milestone=[% milestone.name FILTER url_quote %]&amp;product=
+ [%- product.name FILTER url_quote %]">
+ [% milestone.bug_count FILTER none %]</a>
[% ELSE %]
None
[% END %]
@@ -66,13 +65,13 @@
<h2>Confirmation</h2>
-[% IF bug_count %]
+[% IF milestone.bug_count %]
<table border="0" cellpadding="20" width="70%" bgcolor="red">
<tr><td>
There
- [% IF bug_count > 1 %]
- are [% bug_count %] [%+ terms.bugs %]
+ [% IF milestone.bug_count > 1 %]
+ are [% milestone.bug_count FILTER none %] [%+ terms.bugs %]
[% ELSE %]
is 1 [% terms.bug %]
[% END %]
@@ -89,8 +88,8 @@
<form method="post" action="editmilestones.cgi">
<input type="submit" value="Yes, delete">
<input type="hidden" name="action" value="delete">
- <input type="hidden" name="product" value="[% product FILTER html %]">
- <input type="hidden" name="milestone" value="[% name FILTER html %]">
+ <input type="hidden" name="product" value="[% product.name FILTER html %]">
+ <input type="hidden" name="milestone" value="[% milestone.name FILTER html %]">
</form>
[% PROCESS admin/milestones/footer.html.tmpl %]
diff --git a/template/en/default/admin/milestones/create.html.tmpl b/template/en/default/admin/milestones/create.html.tmpl
index d8779dd54..99a7f833a 100644
--- a/template/en/default/admin/milestones/create.html.tmpl
+++ b/template/en/default/admin/milestones/create.html.tmpl
@@ -20,12 +20,13 @@
#%]
[%# INTERFACE:
- # product: string; name of the product the milestone is being created for
+ # product: object; Bugzilla::Product object representing the product to
+ # which the milestone belongs.
#%]
-[% title = BLOCK %]Add Milestone to Product '[% product FILTER html %]'[% END %]
+[% title = BLOCK %]Add Milestone to Product '[% product.name FILTER html %]'[% END %]
[% h2 = BLOCK %]This page allows you to add a new milestone to product
- '[% product FILTER html %]'.[% END %]
+ '[% product.name FILTER html %]'.[% END %]
[% PROCESS global/header.html.tmpl
title = title
h2 = h2
@@ -47,7 +48,7 @@
</table>
<input type="submit" value="Add">
<input type="hidden" name="action" value="new">
- <input type="hidden" name='product' value="[% product FILTER html %]">
+ <input type="hidden" name='product' value="[% product.name FILTER html %]">
</form>
diff --git a/template/en/default/admin/milestones/created.html.tmpl b/template/en/default/admin/milestones/created.html.tmpl
index 87e08cebe..33d2bcba6 100644
--- a/template/en/default/admin/milestones/created.html.tmpl
+++ b/template/en/default/admin/milestones/created.html.tmpl
@@ -20,22 +20,24 @@
#%]
[%# INTERFACE:
- # name: string; the name of the newly created milestone
+ # milestone: object; Bugzilla::Milestone object representing the
+ # milestone the user created.
#
- # product: string; the name of the product the milestone belongs to
+ # product: object; Bugzilla::Product object representing the product to
+ # which the milestone belongs.
#%]
[% title = BLOCK %]Adding new Milestone of Product
- '[% product FILTER html %]'[% END %]
+ '[% product.name FILTER html %]'[% END %]
[% PROCESS global/header.html.tmpl
title = title
%]
-<p>The milestone '<a title="Edit milestone '[% name FILTER html %]' of
- product '[% product FILTER html %]'"
+<p>The milestone '<a title="Edit milestone '[% milestone.name FILTER html %]' of
+ product '[% product.name FILTER html %]'"
href="editmilestones.cgi?action=edit&amp;product=
- [%- product FILTER url_quote %]&amp;milestone=[% name FILTER url_quote %]">
- [%- name FILTER html %]</a>' has been created.</p>
+ [%- product.name FILTER url_quote %]&amp;milestone=[% milestone.name FILTER url_quote %]">
+ [%- milestone.name FILTER html %]</a>' has been created.</p>
<p>
diff --git a/template/en/default/admin/milestones/deleted.html.tmpl b/template/en/default/admin/milestones/deleted.html.tmpl
index 8db9b8943..bddae3136 100644
--- a/template/en/default/admin/milestones/deleted.html.tmpl
+++ b/template/en/default/admin/milestones/deleted.html.tmpl
@@ -21,25 +21,23 @@
#%]
[%# INTERFACE:
- # name: string; the name of the deleted milestone.
- #
- # product: string; the name of the product the milestone belonged to
- #
- # bug_count: number; the number of bugs which were reassigned to
- # the default milestone.
+ # product: object; Bugzilla::Product object representing the product to
+ # which the milestone belongs.
+ # milestone: object; Bugzilla::Milestone object representing the
+ # milestone the user deleted.
#%]
-[% title = BLOCK %]Deleted Milestone '[% name FILTER html %]' of Product
- '[% product FILTER html %]'[% END %]
+[% title = BLOCK %]Deleted Milestone '[% milestone.name FILTER html %]' of Product
+ '[% product.name FILTER html %]'[% END %]
[% PROCESS global/header.html.tmpl
title = title
%]
<p>
-[% IF bug_count %]
+[% IF milestone.bug_count %]
- [% bug_count %]
- [% IF bug_count > 1 %]
+ [% milestone.bug_count FILTER none %]
+ [% IF milestone.bug_count > 1 %]
[%+ terms.bugs %]
[% ELSE %]
[%+ terms.bug %]
@@ -51,7 +49,7 @@
[% END %]
</p>
-<p>Milestone '[% name FILTER html %]' deleted.</p>
+<p>Milestone '[% milestone.name FILTER html %]' deleted.</p>
<p>
diff --git a/template/en/default/admin/milestones/edit.html.tmpl b/template/en/default/admin/milestones/edit.html.tmpl
index f49cacf4a..1fdea30e0 100644
--- a/template/en/default/admin/milestones/edit.html.tmpl
+++ b/template/en/default/admin/milestones/edit.html.tmpl
@@ -20,17 +20,16 @@
#%]
[%# INTERFACE:
- # name: string; The name of the milestone
- #
- # sortkey: number; milestone sortkey
- #
- # product: string; The product the milestone belongs to
+ # product: object; Bugzilla::Product object representing the product to
+ # which the milestone belongs.
+ # milestone: object; Bugzilla::Milestone object representing the
+ # milestone the user wants to edit.
#%]
[% PROCESS global/variables.none.tmpl %]
-[% title = BLOCK %]Edit Milestone '[% name FILTER html %]' of product '
- [%- product FILTER html %]'[% END %]
+[% title = BLOCK %]Edit Milestone '[% milestone.name FILTER html %]' of product '
+ [%- product.name FILTER html %]'[% END %]
[% PROCESS global/header.html.tmpl
title = title
onload = "document.forms['f'].milestone.select()"
@@ -42,19 +41,19 @@
<tr>
<th valign="top"><label for="milestone">Milestone:</label></th>
<td><input id="milestone" size="20" maxlength="20" name="milestone" value="
- [%- name FILTER html %]"></td>
+ [%- milestone.name FILTER html %]"></td>
</tr>
<tr>
<th align="right"><label for="sortkey">Sortkey:</label></th>
<td><input id="sortkey" size="20" maxlength="20" name="sortkey" value="
- [%- sortkey FILTER html %]"></td>
+ [%- milestone.sortkey FILTER html %]"></td>
</tr>
</table>
- <input type="hidden" name="milestoneold" value="[% name FILTER html %]">
+ <input type="hidden" name="milestoneold" value="[% milestone.name FILTER html %]">
<input type="hidden" name="action" value="update">
- <input type="hidden" name="product" value="[% product FILTER html %]">
+ <input type="hidden" name="product" value="[% product.name FILTER html %]">
<input type="submit" value="Update">
</form>
diff --git a/template/en/default/admin/milestones/footer.html.tmpl b/template/en/default/admin/milestones/footer.html.tmpl
index 8980d642e..48a4d950a 100644
--- a/template/en/default/admin/milestones/footer.html.tmpl
+++ b/template/en/default/admin/milestones/footer.html.tmpl
@@ -20,10 +20,11 @@
#%]
[%# INTERFACE:
- # name: string; the name of the milestone
+ # product: object; Bugzilla::Product object representing the product to
+ # which the milestone belongs.
#
- # product: string; the name of the product which the milestone
- # belongs/belonged to
+ # milestone: object; Bugzilla::Milestone object representing the
+ # milestone.
#
# no_XXX_link: boolean; if defined, then don't show the corresponding
# link. Supported parameters are:
@@ -38,29 +39,30 @@
<hr>
[% UNLESS no_add_milestone_link %]
- <a title="Add a milestone to product '[% product FILTER html %]'"
+ <a title="Add a milestone to product '[% product.name FILTER html %]'"
href="editmilestones.cgi?action=add&amp;product=
- [%- product FILTER url_quote %]">Add</a> a milestone.
+ [%- product.name FILTER url_quote %]">Add</a> a milestone.
[% END %]
-[% IF name && !no_edit_milestone_link %]
+[% IF milestone.name && !no_edit_milestone_link %]
Edit milestone <a
- title="Edit Milestone '[% name FILTER html %]' of product '
- [%- product FILTER html %]'"
+ title="Edit Milestone '[% milestone.name FILTER html %]' of product '
+ [%- product.name FILTER html %]'"
href="editmilestones.cgi?action=edit&amp;product=
- [%- product FILTER url_quote %]&amp;milestone=[% name FILTER url_quote %]">
- '[% name FILTER html %]'</a>.
+ [%- product.name FILTER url_quote %]&amp;milestone=
+ [%- milestone.name FILTER url_quote %]">
+ '[% milestone.name FILTER html %]'</a>.
[% END %]
[% UNLESS no_edit_other_milestones_link %]
Edit other milestones of product <a
href="editmilestones.cgi?product=
- [%- product FILTER url_quote %]">'[% product FILTER html %]'</a>.
+ [%- product.name FILTER url_quote %]">'[% product.name FILTER html %]'</a>.
[% END %]
Edit product <a
href="editproducts.cgi?action=edit&amp;product=
- [%- product FILTER url_quote %]">'[% product FILTER html %]'</a>.
+ [%- product.name FILTER url_quote %]">'[% product.name FILTER html %]'</a>.
</p>
diff --git a/template/en/default/admin/milestones/list.html.tmpl b/template/en/default/admin/milestones/list.html.tmpl
index b9311fc1a..d25308583 100644
--- a/template/en/default/admin/milestones/list.html.tmpl
+++ b/template/en/default/admin/milestones/list.html.tmpl
@@ -21,9 +21,9 @@
#%]
[%# INTERFACE:
- # milestones: array of milestone objects
+ # product: object; Bugzilla::Product object representing the product to
+ # which the milestones belongs.
# showbugcounts: if defined, then bug counts should be included in the table
- # product: string; the name of the product we are editing milestones for
#%]
[% USE Bugzilla %]
@@ -32,17 +32,17 @@
[% PROCESS global/variables.none.tmpl %]
[% title = BLOCK %]Select milestone of product
- '[% product FILTER html %]'[% END %]
+ '[% product.name FILTER html %]'[% END %]
[% PROCESS global/header.html.tmpl
title = title
%]
[% edit_contentlink = BLOCK %]editmilestones.cgi?action=edit&amp;product=
- [%- product FILTER url_quote %]&amp;milestone=%%name%%[% END %]
+ [%- product.name FILTER url_quote %]&amp;milestone=%%name%%[% END %]
[% delete_contentlink = BLOCK %]editmilestones.cgi?action=del&amp;product=
- [%- product FILTER url_quote %]&amp;milestone=%%name%%[% END %]
+ [%- product.name FILTER url_quote %]&amp;milestone=%%name%%[% END %]
[% bug_count_contentlink = BLOCK %]buglist.cgi?target_milestone=%%name%%&amp;product=
- [%- product FILTER url_quote %][% END %]
+ [%- product.name FILTER url_quote %][% END %]
[% columns = [
@@ -81,7 +81,7 @@
[%# We want to override the usual 'Delete' link for the default
milestone %]
[% overrides.action = [ {
- match_value => "$default_milestone"
+ match_value => product.default_milestone
match_field => 'name'
override_content => 1
content => "(Default milestone)"
@@ -92,7 +92,7 @@
[% PROCESS admin/table.html.tmpl
columns = columns
- data = milestones
+ data = product.milestones
overrides = overrides
%]
@@ -100,7 +100,7 @@
[% IF ! showbugcounts %]
- <p><a href="editmilestones.cgi?product=[% product FILTER url_quote %]&amp;showbugcounts=1">
+ <p><a href="editmilestones.cgi?product=[% product.name FILTER url_quote %]&amp;showbugcounts=1">
Redisplay table with [% terms.bug %] counts (slower)</a></p>
[% END %]
diff --git a/template/en/default/admin/milestones/updated.html.tmpl b/template/en/default/admin/milestones/updated.html.tmpl
index bfc09e210..4208e8d79 100644
--- a/template/en/default/admin/milestones/updated.html.tmpl
+++ b/template/en/default/admin/milestones/updated.html.tmpl
@@ -20,35 +20,29 @@
#%]
[%# INTERFACE:
+ # product: object; Bugzilla::Product object representing the product to
+ # which the milestone belongs.
#
# 'updated_XXX' variables are booleans, and are defined if the
# 'XXX' field was updated during the edit just being handled.
- # Variables called just 'XXX' are strings, and are the _new_ contents
- # of the fields.
- #
- # name & updated_name: the name of the milestone
- #
- # sortkey & updated_sortkey: the milestone sortkey
- #
- # product: string; the name of the product the milestone belongs to
#%]
-[% title = BLOCK %]Updating Milestone '[% name FILTER html %]' of Product
- '[% product FILTER html %]'[% END %]
+[% title = BLOCK %]Updating Milestone '[% milestone.name FILTER html %]' of Product
+ '[% product.name FILTER html %]'[% END %]
[% PROCESS global/header.html.tmpl
title = title
%]
[% IF updated_name %]
- <p>Updated Milestone name to: '[% name FILTER html %]'.</p>
+ <p>Updated Milestone name to: '[% milestone.name FILTER html %]'.</p>
[% END %]
[% IF updated_sortkey %]
- <p>Updated Milestone sortkey to: '[% sortkey FILTER html %]'.</p>
+ <p>Updated Milestone sortkey to: '[% milestone.sortkey FILTER html %]'.</p>
[% END %]
[% UNLESS updated_sortkey || updated_name %]
- <p>Nothing changed for milestone '[% name FILTER html %]'.
+ <p>Nothing changed for milestone '[% milestone.name FILTER html %]'.
[% END %]
<p>
diff --git a/template/en/default/admin/versions/confirm-delete.html.tmpl b/template/en/default/admin/versions/confirm-delete.html.tmpl
index 34ada607b..a3e8f8d62 100644
--- a/template/en/default/admin/versions/confirm-delete.html.tmpl
+++ b/template/en/default/admin/versions/confirm-delete.html.tmpl
@@ -21,15 +21,13 @@
#%]
[%# INTERFACE:
- # name: string; The name of the version
- #
- # bug_count: number; The number of bugs targetted at the version
- #
- # product: string; The name of the product
- #
+ # product: object; Bugzilla::Product object representing the product to
+ # which the version belongs.
+ # version: object; Bugzilla::Version object representing the
+ # version the user wants to delete.
#%]
-[% title = BLOCK %]Delete Version of Product '[% product FILTER html %]'
+[% title = BLOCK %]Delete Version of Product '[% product.name FILTER html %]'
[% END %]
[% PROCESS global/header.html.tmpl
@@ -43,20 +41,21 @@
</tr>
<tr>
<td valign="top">Version:</td>
- <td valign="top">[% name FILTER html %]</td>
+ <td valign="top">[% version.name FILTER html %]</td>
</tr>
<tr>
<td valign="top">Version of Product:</td>
- <td valign="top">[% product FILTER html %]</td>
+ <td valign="top">[% product.name FILTER html %]</td>
</tr>
<tr>
<td valign="top">[% terms.Bugs %]:</td>
<td valign="top">
-[% IF bug_count %]
+[% IF version.bug_count %]
<a title="List of [% terms.bugs %] targetted at version '
- [% name FILTER html %]'"
- href="buglist.cgi?version=[% name FILTER url_quote %]&amp;product=
- [%- product FILTER url_quote %]">[% bug_count %]</a>
+ [%- version.name FILTER html %]'"
+ href="buglist.cgi?version=[% version.name FILTER url_quote %]&amp;product=
+ [%- product.name FILTER url_quote %]">
+ [%- version.bug_count FILTER none %]</a>
[% ELSE %]
None
[% END %]
@@ -66,18 +65,18 @@
<h2>Confirmation</h2>
-[% IF bug_count %]
+[% IF version.bug_count %]
Sorry, there
- [% IF bug_count > 1 %]
- are [% bug_count %] [%+ terms.bugs %]
+ [% IF version.bug_count > 1 %]
+ are [% version.bug_count FILTER none %] [%+ terms.bugs %]
[% ELSE %]
- is [% bug_count %] [%+ terms.bug %]
+ is [% version.bug_count FILTER none %] [%+ terms.bug %]
[% END %]
outstanding for this version. You must move
- [% IF bug_count > 1 %]
+ [% IF version.bug_count > 1 %]
those [% terms.bugs %]
[% ELSE %]
that [% terms.bug %]
@@ -91,8 +90,8 @@
<form method="post" action="editversions.cgi">
<input type="submit" value="Yes, delete">
<input type="hidden" name="action" value="delete">
- <input type="hidden" name="product" value="[% product FILTER html %]">
- <input type="hidden" name="version" value="[% name FILTER html %]">
+ <input type="hidden" name="product" value="[% product.name FILTER html %]">
+ <input type="hidden" name="version" value="[% version.name FILTER html %]">
</form>
[% END %]
diff --git a/template/en/default/admin/versions/create.html.tmpl b/template/en/default/admin/versions/create.html.tmpl
index 594bf4f87..614996300 100644
--- a/template/en/default/admin/versions/create.html.tmpl
+++ b/template/en/default/admin/versions/create.html.tmpl
@@ -20,12 +20,13 @@
#%]
[%# INTERFACE:
- # product: string; name of the product the version is being created for
+ # product: object; Bugzilla::Product object representing the product to
+ # which the version is being created for
#%]
-[% title = BLOCK %]Add Version to Product '[% product FILTER html %]'[% END %]
+[% title = BLOCK %]Add Version to Product '[% product.name FILTER html %]'[% END %]
[% h2 = BLOCK %]This page allows you to add a new version to product
- '[% product FILTER html %]'.[% END %]
+ '[% product.name FILTER html %]'.[% END %]
[% PROCESS global/header.html.tmpl
title = title
h2 = h2
@@ -41,7 +42,7 @@
</table>
<input type="submit" value="Add">
<input type="hidden" name="action" value="new">
- <input type="hidden" name='product' value="[% product FILTER html %]">
+ <input type="hidden" name='product' value="[% product.name FILTER html %]">
</form>
diff --git a/template/en/default/admin/versions/created.html.tmpl b/template/en/default/admin/versions/created.html.tmpl
index 84445cccd..597ac119f 100644
--- a/template/en/default/admin/versions/created.html.tmpl
+++ b/template/en/default/admin/versions/created.html.tmpl
@@ -20,22 +20,23 @@
#%]
[%# INTERFACE:
- # name: string; the name of the newly created version
- #
- # product: string; the name of the product the version belongs to
+ # product: object; Bugzilla::Product object representing the product to
+ # which the version belongs.
+ # version: object; Bugzilla::Version object representing the
+ # newly created version
#%]
[% title = BLOCK %]Adding new Version of Product
- '[% product FILTER html %]'[% END %]
+ '[% product.name FILTER html %]'[% END %]
[% PROCESS global/header.html.tmpl
title = title
%]
-<p>The version '<a title="Edit version '[% name FILTER html %]' of product '
- [%- product FILTER html %]'"
+<p>The version '<a title="Edit version '[% version.name FILTER html %]' of product '
+ [%- product.name FILTER html %]'"
href="editversions.cgi?action=edit&amp;product=
- [%- product FILTER url_quote %]&amp;version=[% name FILTER url_quote %]">
- [%- name FILTER html %]</a>' has been created.</p>
+ [%- product.name FILTER url_quote %]&amp;version=[% version.name FILTER url_quote %]">
+ [%- version.name FILTER html %]</a>' has been created.</p>
<p>
diff --git a/template/en/default/admin/versions/deleted.html.tmpl b/template/en/default/admin/versions/deleted.html.tmpl
index 2ec3ebe10..ab75d0a5b 100644
--- a/template/en/default/admin/versions/deleted.html.tmpl
+++ b/template/en/default/admin/versions/deleted.html.tmpl
@@ -20,19 +20,19 @@
#%]
[%# INTERFACE:
- # name: string; the name of the deleted version.
- #
- # product: string; the name of the product the version belonged to
- #
+ # product: object; Bugzilla::Product object representing the product to
+ # which the version belongs.
+ # version: object; Bugzilla::Version object representing the
+ # version the user deleted.
#%]
-[% title = BLOCK %]Deleted Version '[% name FILTER html %]' of Product
- '[% product FILTER html %]'[% END %]
+[% title = BLOCK %]Deleted Version '[% version.name FILTER html %]' of Product
+ '[% product.name FILTER html %]'[% END %]
[% PROCESS global/header.html.tmpl
title = title
%]
-<p>Version '[% name FILTER html %]' deleted.</p>
+<p>Version '[% version.name FILTER html %]' deleted.</p>
<p>
diff --git a/template/en/default/admin/versions/edit.html.tmpl b/template/en/default/admin/versions/edit.html.tmpl
index ef1fbd270..eff3d92ad 100644
--- a/template/en/default/admin/versions/edit.html.tmpl
+++ b/template/en/default/admin/versions/edit.html.tmpl
@@ -20,15 +20,16 @@
#%]
[%# INTERFACE:
- # name: string; The name of the version
- #
- # product: string; The product the version belongs to
+ # product: object; Bugzilla::Product object representing the product to
+ # which the version belongs.
+ # version: object; Bugzilla::Version object representing the
+ # version the user wants to edit.
#%]
[% PROCESS global/variables.none.tmpl %]
-[% title = BLOCK %]Edit Version '[% name FILTER html %]' of product '
- [%- product FILTER html %]'[% END %]
+[% title = BLOCK %]Edit Version '[% version.name FILTER html %]' of product '
+ [%- product.name FILTER html %]'[% END %]
[% PROCESS global/header.html.tmpl
title = title
%]
@@ -39,14 +40,14 @@
<tr>
<th valign="top"><label for="version">Version:</label></th>
<td><input id="version" size="64" maxlength="64" name="version" value="
- [%- name FILTER html %]"></td>
+ [%- version.name FILTER html %]"></td>
</tr>
</table>
- <input type="hidden" name="versionold" value="[% name FILTER html %]">
+ <input type="hidden" name="versionold" value="[% version.name FILTER html %]">
<input type="hidden" name="action" value="update">
- <input type="hidden" name="product" value="[% product FILTER html %]">
+ <input type="hidden" name="product" value="[% product.name FILTER html %]">
<input type="submit" value="Update">
</form>
diff --git a/template/en/default/admin/versions/footer.html.tmpl b/template/en/default/admin/versions/footer.html.tmpl
index 252005697..cf5e16ddd 100644
--- a/template/en/default/admin/versions/footer.html.tmpl
+++ b/template/en/default/admin/versions/footer.html.tmpl
@@ -20,10 +20,9 @@
#%]
[%# INTERFACE:
- # name: string; the name of the version
- #
- # product: string; the name of the product which the version
- # belongs/belonged to
+ # product: object; Bugzilla::Product object representing the product to
+ # which the version belongs.
+ # version: object; Bugzilla::Version object representing the version
#
# no_XXX_link: boolean; if defined, then don't show the corresponding
# link. Supported parameters are:
@@ -38,29 +37,30 @@
<hr>
[% UNLESS no_add_version_link %]
- <a title="Add a version to product '[% product FILTER html %]'"
+ <a title="Add a version to product '[% product.name FILTER html %]'"
href="editversions.cgi?action=add&amp;product=
- [%- product FILTER url_quote %]">Add</a> a version.
+ [%- product.name FILTER url_quote %]">Add</a> a version.
[% END %]
-[% IF name && !no_edit_version_link %]
+[% IF version.name && !no_edit_version_link %]
Edit version <a
- title="Edit Version '[% name FILTER html %]' of product '
- [%- product FILTER html %]'"
+ title="Edit Version '[% version.name FILTER html %]' of product '
+ [%- product.name FILTER html %]'"
href="editversions.cgi?action=edit&amp;product=
- [%- product FILTER url_quote %]&amp;version=[% name FILTER url_quote %]">
- '[% name FILTER html %]'</a>.
+ [%- product.name FILTER url_quote %]&amp;version=
+ [%- version.name FILTER url_quote %]">
+ '[% version.name FILTER html %]'</a>.
[% END %]
[% UNLESS no_edit_other_versions_link %]
Edit other versions of product <a
href="editversions.cgi?product=
- [%- product FILTER url_quote %]">'[% product FILTER html %]'</a>.
+ [%- product.name FILTER url_quote %]">'[% product.name FILTER html %]'</a>.
[% END %]
Edit product <a
href="editproducts.cgi?action=edit&amp;product=
- [%- product FILTER url_quote %]">'[% product FILTER html %]'</a>.
+ [%- product.name FILTER url_quote %]">'[% product.name FILTER html %]'</a>.
</p>
diff --git a/template/en/default/admin/versions/list.html.tmpl b/template/en/default/admin/versions/list.html.tmpl
index b2ed2c343..5102dd506 100644
--- a/template/en/default/admin/versions/list.html.tmpl
+++ b/template/en/default/admin/versions/list.html.tmpl
@@ -21,25 +21,24 @@
#%]
[%# INTERFACE:
- # versions: array of version objects
- # showbugcounts: if defined, then bug counts should be included in the table
- # product: string; the name of the product we are editing versions for
+ # product: object; Bugzilla::Product object representing the product to
+ # which the versions belongs.
#%]
[% PROCESS global/variables.none.tmpl %]
[% title = BLOCK %]Select version of product
- '[% product FILTER html %]'[% END %]
+ '[% product.name FILTER html %]'[% END %]
[% PROCESS global/header.html.tmpl
title = title
%]
[% edit_contentlink = BLOCK %]editversions.cgi?action=edit&amp;product=
- [%- product FILTER url_quote %]&amp;version=%%name%%[% END %]
+ [%- product.name FILTER url_quote %]&amp;version=%%name%%[% END %]
[% delete_contentlink = BLOCK %]editversions.cgi?action=del&amp;product=
- [%- product FILTER url_quote %]&amp;version=%%name%%[% END %]
+ [%- product.name FILTER url_quote %]&amp;version=%%name%%[% END %]
[% bug_count_contentlink = BLOCK %]buglist.cgi?version=%%name%%&amp;product=
- [%- product FILTER url_quote %][% END %]
+ [%- product.name FILTER url_quote %][% END %]
[% columns = [
@@ -72,14 +71,14 @@
[% PROCESS admin/table.html.tmpl
columns = columns
- data = versions
+ data = product.versions
%]
<p>
[% IF ! showbugcounts %]
- <p><a href="editversions.cgi?product=[% product FILTER url_quote %]&amp;showbugcounts=1">
+ <p><a href="editversions.cgi?product=[% product.name FILTER url_quote %]&amp;showbugcounts=1">
Redisplay table with [% terms.bug %] counts (slower)</a></p>
[% END %]
diff --git a/template/en/default/admin/versions/updated.html.tmpl b/template/en/default/admin/versions/updated.html.tmpl
index 04851adae..5bae6bcf6 100644
--- a/template/en/default/admin/versions/updated.html.tmpl
+++ b/template/en/default/admin/versions/updated.html.tmpl
@@ -20,26 +20,26 @@
#%]
[%# INTERFACE:
+ # product: object; Bugzilla::Product object representing the product to
+ # which the version belongs.
+ # version: object; Bugzilla::Version object representing the
+ # version the user updated.
#
# updated_name: boolean; defined if the 'name' field was updated
- #
- # name: string; the new name of the version
- #
- # product: string; the name of the product the version belongs to
#%]
-[% title = BLOCK %]Updating Version '[% name FILTER html %]' of Product
- '[% product FILTER html %]'[% END %]
+[% title = BLOCK %]Updating Version '[% version.name FILTER html %]' of Product
+ '[% product.name FILTER html %]'[% END %]
[% PROCESS global/header.html.tmpl
title = title
%]
[% IF updated_name %]
- <p>Updated Version name to: '[% name FILTER html %]'.</p>
+ <p>Updated Version name to: '[% version.name FILTER html %]'.</p>
[% END %]
[% UNLESS updated_name %]
- <p>Nothing changed for version '[% name FILTER html %]'.
+ <p>Nothing changed for version '[% version.name FILTER html %]'.
[% END %]
<p>
diff --git a/template/en/default/filterexceptions.pl b/template/en/default/filterexceptions.pl
index 40a96e70b..b22782147 100644
--- a/template/en/default/filterexceptions.pl
+++ b/template/en/default/filterexceptions.pl
@@ -557,10 +557,6 @@
'comp.bug_count'
],
-'admin/components/deleted.html.tmpl' => [
- 'deleted_bug_count'
-],
-
'admin/users/confirm-delete.html.tmpl' => [
'andstring',
'responsibilityterms.$responsibility',
@@ -591,18 +587,6 @@
'comp.bug_count'
],
-'admin/milestones/confirm-delete.html.tmpl' => [
- 'bug_count'
-],
-
-'admin/milestones/deleted.html.tmpl' => [
- 'bug_count'
-],
-
-'admin/versions/confirm-delete.html.tmpl' => [
- 'bug_count'
-],
-
'admin/settings/edit.html.tmpl' => [
'name',
'checkbox_name'
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 390c6b12c..3f2a54146 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -778,8 +778,9 @@
[% title = "Default milestone not deletable" %]
[% admindocslinks = {'products.html' => 'Administering products',
'milestones.html' => 'About Milestones'} %]
- Sorry, but [% name FILTER html %] is the default milestone for
- product '[% product FILTER html %]', and so it can not be deleted.
+ Sorry, but [% milestone.name FILTER html %] is the default milestone
+ for product '[% product.name FILTER html %]', and so it can not be
+ deleted.
[% ELSIF error == "milestone_name_too_long" %]
[% title = "Milestone Name Is Too Long" %]