Skip to content

bugzilla
bugzilla
Commit ab199bf5 authored by lpsolit%gmail.com's avatar lpsolit%gmail.com
Browse files
Options

Bug 286294: cleanup editclassifications.cgi and migrate the existent code to use…

Bug 286294: cleanup editclassifications.cgi and migrate the existent code to use Classification.pm - Patch by Tiago R. Mello <timello@gmail.com> r=LpSolit a=myk
parent 966c2621
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 54 additions and 33 deletions
Bugzilla/Classification.pm
View file @ ab199bf5
......@@ -21,6 +21,7 @@ package Bugzilla::Classification;
use Bugzilla;
use Bugzilla::Util;
use Bugzilla::Error;
###############################
#### Initialization ####
......@@ -87,7 +88,7 @@ sub product_count {
if (!defined $self->{'product_count'}) {
$self->{'product_count'} = $dbh->selectrow_array(q{
SELECT COUNT(*) FROM products
WHERE classification_id = ?}, undef, $self->id);
WHERE classification_id = ?}, undef, $self->id) || 0;
}
return $self->{'product_count'};
}
......@@ -108,13 +109,31 @@ sub get_all_classifications () {
my $dbh = Bugzilla->dbh;
my $ids = $dbh->selectcol_arrayref(q{
SELECT id FROM classifications});
SELECT id FROM classifications ORDER BY name});
my $classifications;
my @classifications;
foreach my $id (@$ids) {
$classifications->{$id} = new Bugzilla::Classification($id);
push @classifications, new Bugzilla::Classification($id);
}
return $classifications;
return @classifications;
}
sub check_classification ($) {
my ($class_name) = @_;
unless ($class_name) {
ThrowUserError("classification_not_specified");
}
my $classification =
new Bugzilla::Classification({name => $class_name});
unless ($classification) {
ThrowUserError("classification_doesnt_exist",
{ name => $class_name });
}
return $classification;
}
1;
......@@ -140,11 +159,14 @@ Bugzilla::Classification - Bugzilla classification class.
my $hash_ref = Bugzilla::Classification::get_all_classifications();
my $classification = $hash_ref->{1};
my $classification =
Bugzilla::Classification::check_classification('AcmeClass');
=head1 DESCRIPTION
Classification.pm represents a Classification object.
A Classification is a higher-level grouping of Bugzilla Products.
A Classification is a higher-level grouping of Products.
=head1 METHODS
......@@ -181,12 +203,20 @@ A Classification is a higher-level grouping of Bugzilla Products.
=item C<get_all_classifications()>
Description: Returns all Bugzilla classifications.
Description: Returns all classifications.
Params: none.
Returns: A hash with classification id as key and
Bugzilla::Classification object as value.
Returns: Bugzilla::Classification object list.
=item C<check_classification($classification_name)>
Description: Checks if the classification name passed in is a
valid classification.
Params: $classification_name - String with a classification name.
Returns: Bugzilla::Classification object.
=back
......
Bugzilla/Product.pm
View file @ ab199bf5
......@@ -196,13 +196,13 @@ sub get_products_by_classification ($) {
my $ids = $dbh->selectcol_arrayref(q{
SELECT id FROM products
WHERE classification_id = ?}, undef, $class_id);
WHERE classification_id = ? ORDER by name}, undef, $class_id);
my $products;
my @products;
foreach my $id (@$ids) {
$products->{$id} = new Bugzilla::Product($id);
push @products, new Bugzilla::Product($id);
}
return $products;
return @products;
}
sub get_all_products () {
......@@ -265,8 +265,7 @@ Bugzilla::Product - Bugzilla product class.
my $defaultmilestone = $product->default_milestone;
my $classificationid = $product->classification_id;
my $hash_ref = Bugzilla::Product::get_products_by_classification(1);
my $product = $hash_ref->{1};
my @products = Bugzilla::Product::get_products_by_classification(1);
=head1 DESCRIPTION
......@@ -355,8 +354,7 @@ Product.pm represents a product object.
Params: $class_id - Integer with classification id.
Returns: A hash with product id as key and a Bugzilla::Product
object as value.
Returns: Bugzilla::Product object list.
=item C<get_all_products()>
......
template/en/default/admin/classifications/edit.html.tmpl
View file @ ab199bf5
......@@ -59,7 +59,6 @@
</table>
<input type=hidden name="classificationold" value="[% classification FILTER html %]">
<input type=hidden name="descriptionold" value="[% description FILTER html %]">
<input type=hidden name="action" value="update">
<input type=submit value="Update">
</form>
......
template/en/default/admin/classifications/reclassify.html.tmpl
View file @ ab199bf5
......@@ -51,9 +51,9 @@
<td></td>
<td valign="top">
<select name="prodlist" id="prodlist" multiple="multiple" size="20">
[% FOREACH cl = class_products %]
<option value="[% cl.value FILTER html %]">
[% cl.name FILTER html %]
[% FOREACH product = unselected_products %]
<option value="[% product.name FILTER html %]">
[[% product.classification.name FILTER html %]]&nbsp;[% product.name FILTER html %]
</option>
[% END %]
</select></td>
......@@ -66,8 +66,8 @@
<td valign="middle" rowspan=2>
<select name="myprodlist" id="myprodlist" multiple="multiple" size="20">
[% FOREACH product = selected_products %]
<option value="[% product FILTER html %]">
[% product FILTER html %]
<option value="[% product.name FILTER html %]">
[% product.name FILTER html %]
</option>
[% END %]
</select></td>
......
template/en/default/admin/classifications/select.html.tmpl
View file @ ab199bf5
......@@ -23,8 +23,6 @@
title = "Select classification"
%]
[% filt_classification = classification FILTER html %]
<table border=1 cellpadding=4 cellspacing=0>
<tr bgcolor="#6666ff">
<th align="left">Edit Classification ...</th>
......@@ -35,7 +33,7 @@
[% FOREACH cl = classifications %]
<tr>
<td valign="top"><a href="editclassifications.cgi?action=edit&amp;classification=[% cl.classification FILTER url_quote %]"><b>[% cl.classification FILTER html %]</b></a></td>
<td valign="top"><a href="editclassifications.cgi?action=edit&amp;classification=[% cl.name FILTER url_quote %]"><b>[% cl.name FILTER html %]</b></a></td>
<td valign="top">
[% IF cl.description %]
[% cl.description %]
......@@ -44,16 +42,16 @@
[% END %]
</td>
[% IF (cl.id == 1) %]
<td valign="top">[% cl.total FILTER html %]</td>
<td valign="top">[% cl.product_count FILTER html %]</td>
[% ELSE %]
<td valign="top"><a href="editclassifications.cgi?action=reclassify&amp;classification=[% cl.classification FILTER url_quote %]">reclassify ([% cl.total FILTER html %])</a></td>
<td valign="top"><a href="editclassifications.cgi?action=reclassify&amp;classification=[% cl.name FILTER url_quote %]">reclassify ([% cl.product_count FILTER html %])</a></td>
[% END %]
[%# don't allow user to delete the default id. %]
[% IF (cl.id == 1) %]
<td valign="top">&nbsp;</td>
[% ELSE %]
<td valign="top"><a href="editclassifications.cgi?action=del&amp;classification=[% cl.classification FILTER url_quote %]">delete</a></td>
<td valign="top"><a href="editclassifications.cgi?action=del&amp;classification=[% cl.name FILTER url_quote %]">delete</a></td>
[% END %]
</tr>
[% END %]
......
template/en/default/global/user-error.html.tmpl
View file @ ab199bf5
......@@ -248,10 +248,6 @@
must reassign those products to another classification before you
can delete this one.
[% ELSIF error == "cant_delete_default_classification" %]
Sorry, but you can not delete the default classification,
'[% name FILTER html %]'.
[% ELSIF error == "component_already_exists" %]
[% title = "Component Already Exists" %]
A component with the name '[% name FILTER html %]' already exists.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment