diff options
| -rwxr-xr-x | editproducts.cgi | 24 | ||||
| -rw-r--r-- | template/en/default/admin/products/edit.html.tmpl | 16 |
2 files changed, 10 insertions, 30 deletions
diff --git a/editproducts.cgi b/editproducts.cgi index e69c99c1e..d168360a6 100755 --- a/editproducts.cgi +++ b/editproducts.cgi @@ -69,28 +69,6 @@ $user->in_group('editcomponents') action => "edit", object => "products"}); -sub get_group_controls { - my $product = shift; - - my $group_controls = $product->group_controls; - # Convert Group Controls (membercontrol and othercontrol) from - # integer to string to display Membercontrol/Othercontrol names - # in the template. - my $constants = { - (CONTROLMAPNA) => 'NA', - (CONTROLMAPSHOWN) => 'Shown', - (CONTROLMAPDEFAULT) => 'Default', - (CONTROLMAPMANDATORY) => 'Mandatory'}; - - foreach my $group (keys %$group_controls) { - foreach my $control ('membercontrol', 'othercontrol') { - $group_controls->{$group}->{$control} = - $constants->{$group_controls->{$group}->{$control}}; - } - } - return $group_controls; -} - # # often used variables # @@ -361,7 +339,6 @@ if ($action eq 'new') { $vars->{'product'} = $product; $vars->{'classification'} = new Bugzilla::Classification($product->classification_id) if Bugzilla->params->{'useclassification'}; - $vars->{'group_controls'} = get_group_controls($product); $vars->{'token'} = issue_session_token('edit_product'); $template->process("admin/products/edit.html.tmpl", $vars) @@ -521,7 +498,6 @@ if ($action eq 'edit' || (!$action && $product_name)) { } $vars->{'classification'} = $classification; } - $vars->{'group_controls'} = get_group_controls($product); $vars->{'product'} = $product; $vars->{'token'} = issue_session_token('edit_product'); diff --git a/template/en/default/admin/products/edit.html.tmpl b/template/en/default/admin/products/edit.html.tmpl index 19a125062..2d346c665 100644 --- a/template/en/default/admin/products/edit.html.tmpl +++ b/template/en/default/admin/products/edit.html.tmpl @@ -22,8 +22,6 @@ # # 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 '[% product.name FILTER html %]'[% END %] @@ -33,6 +31,12 @@ style_urls = ['skins/standard/admin.css'] %] +[% group_control = {${constants.CONTROLMAPNA} => 'NA', + ${constants.CONTROLMAPSHOWN} => 'Shown', + ${constants.CONTROLMAPDEFAULT} => 'Default', + ${constants.CONTROLMAPMANDATORY} => 'Mandatory'} + %] + <form method="post" action="editproducts.cgi"> <table border="0" cellpadding="4" cellspacing="0"> @@ -103,12 +107,12 @@ versions:</a> </a> </th> <td> - [% IF group_controls.size %] - [% FOREACH g = group_controls.values %] + [% IF product.group_controls.size %] + [% FOREACH g = product.group_controls.values %] <b>[% g.group.name FILTER html %]:</b> [% IF g.group.isactive %] - [% g.membercontrol FILTER html %]/ - [% g.othercontrol FILTER html %] + [% group_control.${g.membercontrol} FILTER html %]/ + [% group_control.${g.othercontrol} FILTER html %] [% IF g.entry %], ENTRY[% END %] [% IF g.canedit %], CANEDIT[% END %] [% IF g.editcomponents %], editcomponents[% END %] |