Skip to content

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

Bug 300532: Update editversions.cgi to use routines from Version.pm and…

Bug 300532: Update editversions.cgi to use routines from Version.pm and Product.pm - Patch by Tiago R. Mello <timello@async.com.br> r=LpSolit a=myk
parent 0b6e8545
Hide whitespace changes
Inline Side-by-side
Showing with 168 additions and 188 deletions
Bugzilla/Product.pm
View file @ 534173a0
...@@ -205,6 +205,33 @@ sub get_products_by_classification ($) { ...@@ -205,6 +205,33 @@ sub get_products_by_classification ($) {
return $products; return $products;
} }
sub get_all_products () {
my $dbh = Bugzilla->dbh;
my $ids = $dbh->selectcol_arrayref(q{
SELECT id FROM products ORDER BY name});
my @products;
foreach my $id (@$ids) {
push @products, new Bugzilla::Product($id);
}
return @products;
}
sub check_product ($) {
my ($product_name) = @_;
unless ($product_name) {
ThrowUserError('product_not_specified');
}
my $product = new Bugzilla::Product({name => $product_name});
unless ($product) {
ThrowUserError('product_doesnt_exist',
{'product' => $product_name});
}
return $product;
}
1; 1;
__END__ __END__
...@@ -326,11 +353,28 @@ Product.pm represents a product object. ...@@ -326,11 +353,28 @@ Product.pm represents a product object.
Description: Returns all products for a specific classification id. Description: Returns all products for a specific classification id.
Params: none. Params: $class_id - Integer with classification id.
Returns: A hash with product id as key and a Bugzilla::Product Returns: A hash with product id as key and a Bugzilla::Product
object as value. object as value.
=item C<get_all_products()>
Description: Returns all products from the database.
Params: none.
Returns: Bugzilla::Product object list.
=item C<check_product($product_name)>
Description: Checks if the product name was passed in and if is a valid
product.
Params: $product_name - String with a product name.
Returns: Bugzilla::Product object.
=back =back
=cut =cut
Bugzilla/Version.pm
View file @ 534173a0
...@@ -73,11 +73,24 @@ sub _init { ...@@ -73,11 +73,24 @@ sub _init {
return $self; return $self;
} }
sub bug_count {
my $self = shift;
my $dbh = Bugzilla->dbh;
if (!defined $self->{'bug_count'}) {
$self->{'bug_count'} = $dbh->selectrow_array(qq{
SELECT COUNT(*) FROM bugs
WHERE product_id = ? AND version = ?}, undef,
($self->product_id, $self->name)) || 0;
}
return $self->{'bug_count'};
}
############################### ###############################
##### Accessors #### ##### Accessors ####
############################### ###############################
sub value { return $_[0]->{'value'}; } sub name { return $_[0]->{'value'}; }
sub product_id { return $_[0]->{'product_id'}; } sub product_id { return $_[0]->{'product_id'}; }
############################### ###############################
...@@ -103,12 +116,24 @@ sub get_versions_by_product ($) { ...@@ -103,12 +116,24 @@ sub get_versions_by_product ($) {
SELECT value FROM versions SELECT value FROM versions
WHERE product_id = ?}, undef, $product_id); WHERE product_id = ?}, undef, $product_id);
my $versions; my @versions;
foreach my $value (@$values) { foreach my $value (@$values) {
$versions->{$value} = new Bugzilla::Version($product_id, push @versions, new Bugzilla::Version($product_id, $value);
$value); }
return @versions;
}
sub check_version ($$) {
my ($product, $version_name) = @_;
$version_name || ThrowUserError('version_not_specified');
my $version = new Bugzilla::Version($product->id, $version_name);
unless ($version) {
ThrowUserError('version_not_valid',
{'product' => $product->name,
'version' => $version_name});
} }
return $versions; return $version;
} }
1; 1;
...@@ -131,6 +156,9 @@ Bugzilla::Version - Bugzilla product version class. ...@@ -131,6 +156,9 @@ Bugzilla::Version - Bugzilla product version class.
my $hash_ref = Bugzilla::Version::get_versions_by_product(1); my $hash_ref = Bugzilla::Version::get_versions_by_product(1);
my $version = $hash_ref->{'version_value'}; my $version = $hash_ref->{'version_value'};
my $version = Bugzilla::Version::check_version($product_obj,
'acme_version');
=head1 DESCRIPTION =head1 DESCRIPTION
Version.pm represents a Product Version object. Version.pm represents a Product Version object.
...@@ -144,11 +172,19 @@ Version.pm represents a Product Version object. ...@@ -144,11 +172,19 @@ Version.pm represents a Product Version object.
Description: The constructor is used to load an existing version Description: The constructor is used to load an existing version
by passing a product id and a version value. by passing a product id and a version value.
Params: $product_id - Integer with a Bugzilla product id. Params: $product_id - Integer with a product id.
$value - String with a version value. $value - String with a version value.
Returns: A Bugzilla::Version object. Returns: A Bugzilla::Version object.
=item C<bug_count()>
Description: Returns the total of bugs that belong to the version.
Params: none.
Returns: Integer with the number of bugs.
=back =back
=head1 SUBROUTINES =head1 SUBROUTINES
...@@ -157,13 +193,21 @@ Version.pm represents a Product Version object. ...@@ -157,13 +193,21 @@ Version.pm represents a Product Version object.
=item C<get_versions_by_product($product_id)> =item C<get_versions_by_product($product_id)>
Description: Returns all Bugzilla product versions that belong Description: Returns all product versions that belong
to the supplied product. to the supplied product.
Params: $product_id - Integer with a Bugzilla product id. Params: $product_id - Integer with a product id.
Returns: Bugzilla::Version object list.
=item C<check_version($product, $version_name)>
Description: Checks if the version name exists for the product name.
Params: $product - A Bugzilla::Product object.
$version_name - String with a version name.
Returns: A hash with version value as key and a Bugzilla::Version Returns: Bugzilla::Version object.
objects as value.
=back =back
......
editversions.cgi
View file @ 534173a0
...@@ -37,82 +37,21 @@ require "globals.pl"; ...@@ -37,82 +37,21 @@ require "globals.pl";
use Bugzilla::Constants; use Bugzilla::Constants;
use Bugzilla::Config qw(:DEFAULT $datadir); use Bugzilla::Config qw(:DEFAULT $datadir);
use Bugzilla::User; use Bugzilla::User;
use Bugzilla::Product;
use Bugzilla::Version;
use vars qw($template $vars); use vars qw($template $vars);
my $cgi = Bugzilla->cgi; my $cgi = Bugzilla->cgi;
my $dbh = Bugzilla->dbh; my $dbh = Bugzilla->dbh;
# TestProduct: just returns if the specified product does exists
# CheckProduct: same check, optionally emit an error text
# TestVersion: just returns if the specified product/version combination exists
# CheckVersion: same check, optionally emit an error text
sub TestProduct ($)
{
my $prod = shift;
# does the product exist?
SendSQL("SELECT name
FROM products
WHERE name = " . SqlQuote($prod));
return FetchOneColumn();
}
sub CheckProduct ($)
{
my $prod = shift;
# do we have a product?
unless ($prod) {
ThrowUserError('product_not_specified');
}
unless (TestProduct $prod) {
ThrowUserError('product_doesnt_exist',
{'product' => $prod});
}
}
sub TestVersion ($$)
{
my ($prod,$ver) = @_;
# does the product exist?
SendSQL("SELECT products.name, value
FROM versions, products
WHERE versions.product_id = products.id
AND products.name = " . SqlQuote($prod) . "
AND value = " . SqlQuote($ver));
return FetchOneColumn();
}
sub CheckVersion ($$)
{
my ($prod, $ver) = @_;
# do we have the version?
unless ($ver) {
ThrowUserError('version_not_specified');
}
CheckProduct($prod);
unless (TestVersion $prod, $ver) {
ThrowUserError('version_not_valid',
{'product' => $prod,
'version' => $ver});
}
}
# #
# Preliminary checks: # Preliminary checks:
# #
Bugzilla->login(LOGIN_REQUIRED); Bugzilla->login(LOGIN_REQUIRED);
print Bugzilla->cgi->header(); print $cgi->header();
UserInGroup("editcomponents") UserInGroup("editcomponents")
|| ThrowUserError("auth_failure", {group => "editcomponents", || ThrowUserError("auth_failure", {group => "editcomponents",
...@@ -122,34 +61,17 @@ UserInGroup("editcomponents") ...@@ -122,34 +61,17 @@ UserInGroup("editcomponents")
# #
# often used variables # often used variables
# #
my $product = trim($cgi->param('product') || ''); my $product_name = trim($cgi->param('product') || '');
my $version = trim($cgi->param('version') || ''); my $version_name = trim($cgi->param('version') || '');
my $action = trim($cgi->param('action') || ''); my $action = trim($cgi->param('action') || '');
# #
# product = '' -> Show nice list of versions # product = '' -> Show nice list of products
# #
unless ($product) { unless ($product_name) {
my @products = ();
SendSQL("SELECT products.name, products.description
FROM products
ORDER BY products.name");
while ( MoreSQLData() ) {
my ($product, $description) = FetchSQLData();
my $prod = {};
$prod->{'name'} = $product;
$prod->{'description'} = $description;
push(@products, $prod);
}
my @products = Bugzilla::Product::get_all_products();
$vars->{'products'} = \@products; $vars->{'products'} = \@products;
$template->process("admin/versions/select-product.html.tmpl", $template->process("admin/versions/select-product.html.tmpl",
$vars) $vars)
...@@ -158,33 +80,17 @@ unless ($product) { ...@@ -158,33 +80,17 @@ unless ($product) {
exit; exit;
} }
my $product = Bugzilla::Product::check_product($product_name);
# #
# action='' -> Show nice list of versions # action='' -> Show nice list of versions
# #
unless ($action) { unless ($action) {
my @versions =
Bugzilla::Version::get_versions_by_product($product->id);
CheckProduct($product); $vars->{'product'} = $product->name;
my $product_id = get_product_id($product);
my @versions = ();
SendSQL("SELECT value
FROM versions
WHERE product_id = $product_id
ORDER BY value");
while ( MoreSQLData() ) {
my $name = FetchOneColumn();
my $version = {};
$version->{'name'} = $name;
push(@versions, $version);
}
$vars->{'product'} = $product;
$vars->{'versions'} = \@versions; $vars->{'versions'} = \@versions;
$template->process("admin/versions/list.html.tmpl", $template->process("admin/versions/list.html.tmpl",
$vars) $vars)
...@@ -204,10 +110,7 @@ unless ($action) { ...@@ -204,10 +110,7 @@ unless ($action) {
if ($action eq 'add') { if ($action eq 'add') {
CheckProduct($product); $vars->{'product'} = $product->name;
my $product_id = get_product_id($product);
$vars->{'product'} = $product;
$template->process("admin/versions/create.html.tmpl", $template->process("admin/versions/create.html.tmpl",
$vars) $vars)
|| ThrowTemplateError($template->error()); || ThrowTemplateError($template->error());
...@@ -223,33 +126,26 @@ if ($action eq 'add') { ...@@ -223,33 +126,26 @@ if ($action eq 'add') {
if ($action eq 'new') { if ($action eq 'new') {
CheckProduct($product);
my $product_id = get_product_id($product);
# Cleanups and valididy checks # Cleanups and valididy checks
$version_name || ThrowUserError('version_blank_name');
unless ($version) { my $version = new Bugzilla::Version($product->id, $version_name);
ThrowUserError('version_blank_name', if ($version) {
{'name' => $version});
}
if (TestVersion($product,$version)) {
ThrowUserError('version_already_exists', ThrowUserError('version_already_exists',
{'name' => $version, {'name' => $version->name,
'product' => $product}); 'product' => $product->name});
} }
# Add the new version # Add the new version
SendSQL("INSERT INTO versions ( " . trick_taint($version_name);
"value, product_id" . $dbh->do("INSERT INTO versions (value, product_id)
" ) VALUES ( " . VALUES (?, ?)", undef, ($version_name, $product->id));
SqlQuote($version) . ", $product_id)");
# Make versioncache flush # Make versioncache flush
unlink "$datadir/versioncache"; unlink "$datadir/versioncache";
$vars->{'name'} = $version; $vars->{'name'} = $version_name;
$vars->{'product'} = $product; $vars->{'product'} = $product->name;
$template->process("admin/versions/created.html.tmpl", $template->process("admin/versions/created.html.tmpl",
$vars) $vars)
|| ThrowTemplateError($template->error()); || ThrowTemplateError($template->error());
...@@ -268,18 +164,13 @@ if ($action eq 'new') { ...@@ -268,18 +164,13 @@ if ($action eq 'new') {
if ($action eq 'del') { if ($action eq 'del') {
CheckVersion($product, $version); my $version = Bugzilla::Version::check_version($product,
my $product_id = get_product_id($product); $version_name);
my $bugs = $version->bug_count;
SendSQL("SELECT count(bug_id)
FROM bugs
WHERE product_id = $product_id
AND version = " . SqlQuote($version));
my $bugs = FetchOneColumn() || 0;
$vars->{'bug_count'} = $bugs; $vars->{'bug_count'} = $bugs;
$vars->{'name'} = $version; $vars->{'name'} = $version->name;
$vars->{'product'} = $product; $vars->{'product'} = $product->name;
$template->process("admin/versions/confirm-delete.html.tmpl", $template->process("admin/versions/confirm-delete.html.tmpl",
$vars) $vars)
|| ThrowTemplateError($template->error()); || ThrowTemplateError($template->error());
...@@ -294,29 +185,24 @@ if ($action eq 'del') { ...@@ -294,29 +185,24 @@ if ($action eq 'del') {
# #
if ($action eq 'delete') { if ($action eq 'delete') {
CheckVersion($product, $version);
my $product_id = get_product_id($product);
trick_taint($version); my $version = Bugzilla::Version::check_version($product,
$version_name);
my $nb_bugs =
$dbh->selectrow_array("SELECT COUNT(bug_id) FROM bugs
WHERE product_id = ? AND version = ?",
undef, ($product_id, $version));
# The version cannot be removed if there are bugs # The version cannot be removed if there are bugs
# associated with it. # associated with it.
if ($nb_bugs) { if ($version->bug_count) {
ThrowUserError("version_has_bugs", { nb => $nb_bugs }); ThrowUserError("version_has_bugs",
{ nb => $version->bug_count });
} }
$dbh->do("DELETE FROM versions WHERE product_id = ? AND value = ?", $dbh->do("DELETE FROM versions WHERE product_id = ? AND value = ?",
undef, ($product_id, $version)); undef, ($product->id, $version->name));
unlink "$datadir/versioncache"; unlink "$datadir/versioncache";
$vars->{'name'} = $version; $vars->{'name'} = $version->name;
$vars->{'product'} = $product; $vars->{'product'} = $product->name;
$template->process("admin/versions/deleted.html.tmpl", $vars) $template->process("admin/versions/deleted.html.tmpl", $vars)
|| ThrowTemplateError($template->error()); || ThrowTemplateError($template->error());
...@@ -333,11 +219,11 @@ if ($action eq 'delete') { ...@@ -333,11 +219,11 @@ if ($action eq 'delete') {
if ($action eq 'edit') { if ($action eq 'edit') {
CheckVersion($product,$version); my $version = Bugzilla::Version::check_version($product,
my $product_id = get_product_id($product); $version_name);
$vars->{'name'} = $version; $vars->{'name'} = $version->name;
$vars->{'product'} = $product; $vars->{'product'} = $product->name;
$template->process("admin/versions/edit.html.tmpl", $template->process("admin/versions/edit.html.tmpl",
$vars) $vars)
...@@ -354,10 +240,11 @@ if ($action eq 'edit') { ...@@ -354,10 +240,11 @@ if ($action eq 'edit') {
if ($action eq 'update') { if ($action eq 'update') {
my $versionold = trim($cgi->param('versionold') || ''); $version_name || ThrowUserError('version_not_specified');
my $version_old_name = trim($cgi->param('versionold') || '');
CheckVersion($product,$versionold); my $version_old =
my $product_id = get_product_id($product); Bugzilla::Version::check_version($product,
$version_old_name);
# Note that the order of this tests is important. If you change # Note that the order of this tests is important. If you change
# them, be sure to test for WHERE='$version' or WHERE='$versionold' # them, be sure to test for WHERE='$version' or WHERE='$versionold'
...@@ -366,23 +253,28 @@ if ($action eq 'update') { ...@@ -366,23 +253,28 @@ if ($action eq 'update') {
'versions WRITE', 'versions WRITE',
'products READ'); 'products READ');
if ($version ne $versionold) { if ($version_name ne $version_old->name) {
unless ($version) {
ThrowUserError('version_blank_name'); my $version = new Bugzilla::Version($product->id,
} $version_name);
if (TestVersion($product,$version)) {
if ($version) {
ThrowUserError('version_already_exists', ThrowUserError('version_already_exists',
{'name' => $version, {'name' => $version->name,
'product' => $product}); 'product' => $product->name});
} }
SendSQL("UPDATE bugs
SET version=" . SqlQuote($version) . " trick_taint($version_name);
WHERE version=" . SqlQuote($versionold) . " $dbh->do("UPDATE bugs
AND product_id = $product_id"); SET version = ?
SendSQL("UPDATE versions WHERE version = ? AND product_id = ?", undef,
SET value = " . SqlQuote($version) . " ($version_name, $version_old->name, $product->id));
WHERE product_id = $product_id
AND value = " . SqlQuote($versionold)); $dbh->do("UPDATE versions
SET value = ?
WHERE product_id = ? AND value = ?", undef,
($version_name, $product->id, $version_old->name));
unlink "$datadir/versioncache"; unlink "$datadir/versioncache";
$vars->{'updated_name'} = 1; $vars->{'updated_name'} = 1;
...@@ -390,8 +282,8 @@ if ($action eq 'update') { ...@@ -390,8 +282,8 @@ if ($action eq 'update') {
$dbh->bz_unlock_tables(); $dbh->bz_unlock_tables();
$vars->{'name'} = $version; $vars->{'name'} = $version_name;
$vars->{'product'} = $product; $vars->{'product'} = $product->name;
$template->process("admin/versions/updated.html.tmpl", $template->process("admin/versions/updated.html.tmpl",
$vars) $vars)
|| ThrowTemplateError($template->error()); || ThrowTemplateError($template->error());
......
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