Skip to content

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

Bug 339384: Make Bugzilla::Milestone use Bugzilla::Object - Patch by Max…

Bug 339384: Make Bugzilla::Milestone use Bugzilla::Object - Patch by Max Kanat-Alexander <mkanat@bugzilla.org> r=LpSolit a=justdave
parent 5f4ade1f
Hide whitespace changes
Inline Side-by-side
Showing with 55 additions and 58 deletions
Bugzilla/DB/Schema.pm
View file @ 3f1a0a81
...@@ -490,6 +490,8 @@ use constant ABSTRACT_SCHEMA => { ...@@ -490,6 +490,8 @@ use constant ABSTRACT_SCHEMA => {
versions => { versions => {
FIELDS => [ FIELDS => [
id => {TYPE => 'MEDIUMSERIAL', NOTNULL => 1,
PRIMARYKEY => 1},
value => {TYPE => 'varchar(64)', NOTNULL => 1}, value => {TYPE => 'varchar(64)', NOTNULL => 1},
product_id => {TYPE => 'INT2', NOTNULL => 1}, product_id => {TYPE => 'INT2', NOTNULL => 1},
], ],
......
Bugzilla/Install/DB.pm
View file @ 3f1a0a81
...@@ -516,6 +516,8 @@ sub update_table_definitions { ...@@ -516,6 +516,8 @@ sub update_table_definitions {
$dbh->bz_add_column('versions', 'id', $dbh->bz_add_column('versions', 'id',
{TYPE => 'MEDIUMSERIAL', NOTNULL => 1, PRIMARYKEY => 1}); {TYPE => 'MEDIUMSERIAL', NOTNULL => 1, PRIMARYKEY => 1});
$dbh->bz_add_column('milestones', 'id',
{TYPE => 'MEDIUMSERIAL', NOTNULL => 1, PRIMARYKEY => 1});
################################################################ ################################################################
# New --TABLE-- changes should go *** A B O V E *** this point # # New --TABLE-- changes should go *** A B O V E *** this point #
......
Bugzilla/Milestone.pm
View file @ 3f1a0a81
...@@ -13,11 +13,14 @@ ...@@ -13,11 +13,14 @@
# The Original Code is the Bugzilla Bug Tracking System. # The Original Code is the Bugzilla Bug Tracking System.
# #
# Contributor(s): Tiago R. Mello <timello@async.com.br> # Contributor(s): Tiago R. Mello <timello@async.com.br>
# Max Kanat-Alexander <mkanat@bugzilla.org>
use strict; use strict;
package Bugzilla::Milestone; package Bugzilla::Milestone;
use base qw(Bugzilla::Object);
use Bugzilla::Util; use Bugzilla::Util;
use Bugzilla::Error; use Bugzilla::Error;
...@@ -27,50 +30,45 @@ use Bugzilla::Error; ...@@ -27,50 +30,45 @@ use Bugzilla::Error;
use constant DEFAULT_SORTKEY => 0; use constant DEFAULT_SORTKEY => 0;
use constant DB_TABLE => 'milestones';
use constant DB_COLUMNS => qw( use constant DB_COLUMNS => qw(
milestones.value id
milestones.product_id value
milestones.sortkey product_id
sortkey
); );
my $columns = join(", ", DB_COLUMNS); use constant NAME_FIELD => 'value';
use constant LIST_ORDER => 'sortkey, value';
sub new { sub new {
my $invocant = shift; my $class = shift;
my $class = ref($invocant) || $invocant; my $param = shift;
my $self = {};
bless($self, $class);
return $self->_init(@_);
}
sub _init {
my $self = shift;
my ($product_id, $value) = (@_);
my $dbh = Bugzilla->dbh; my $dbh = Bugzilla->dbh;
my $milestone; my $product;
if (ref $param) {
if (defined $product_id $product = $param->{product};
&& detaint_natural($product_id) my $name = $param->{name};
&& defined $value) { if (!defined $product) {
ThrowCodeError('bad_arg',
trick_taint($value); {argument => 'product',
$milestone = $dbh->selectrow_hashref(qq{ function => "${class}::new"});
SELECT $columns FROM milestones }
WHERE value = ? if (!defined $name) {
AND product_id = ?}, undef, ($value, $product_id)); ThrowCodeError('bad_arg',
} else { {argument => 'name',
ThrowCodeError('bad_arg', function => "${class}::new"});
{argument => 'product_id/value', }
function => 'Bugzilla::Milestone::_init'});
my $condition = 'product_id = ? AND value = ?';
my @values = ($product->id, $name);
$param = { condition => $condition, values => \@values };
} }
return undef unless (defined $milestone); unshift @_, $param;
return $class->SUPER::new(@_);
foreach my $field (keys %$milestone) {
$self->{$field} = $milestone->{$field};
}
return $self;
} }
sub bug_count { sub bug_count {
...@@ -105,8 +103,8 @@ sub check_milestone { ...@@ -105,8 +103,8 @@ sub check_milestone {
ThrowUserError('milestone_not_specified'); ThrowUserError('milestone_not_specified');
} }
my $milestone = new Bugzilla::Milestone($product->id, my $milestone = new Bugzilla::Milestone({ product => $product,
$milestone_name); name => $milestone_name });
unless ($milestone) { unless ($milestone) {
ThrowUserError('milestone_not_valid', ThrowUserError('milestone_not_valid',
{'product' => $product->name, {'product' => $product->name,
...@@ -141,7 +139,8 @@ Bugzilla::Milestone - Bugzilla product milestone class. ...@@ -141,7 +139,8 @@ Bugzilla::Milestone - Bugzilla product milestone class.
use Bugzilla::Milestone; use Bugzilla::Milestone;
my $milestone = new Bugzilla::Milestone(1, 'milestone_value'); my $milestone = new Bugzilla::Milestone(
{ product => $product, name => 'milestone_value' });
my $product_id = $milestone->product_id; my $product_id = $milestone->product_id;
my $value = $milestone->value; my $value = $milestone->value;
......
Bugzilla/Product.pm
View file @ 3f1a0a81
...@@ -120,16 +120,11 @@ sub milestones { ...@@ -120,16 +120,11 @@ sub milestones {
my $dbh = Bugzilla->dbh; my $dbh = Bugzilla->dbh;
if (!defined $self->{milestones}) { if (!defined $self->{milestones}) {
my $values = $dbh->selectcol_arrayref(q{ my $ids = $dbh->selectcol_arrayref(q{
SELECT value FROM milestones SELECT id FROM milestones
WHERE product_id = ? WHERE product_id = ?}, undef, $self->id);
ORDER BY sortkey}, undef, $self->id);
my @milestones; $self->{milestones} = Bugzilla::Milestone->new_from_list($ids);
foreach my $value (@$values) {
push @milestones, new Bugzilla::Milestone($self->id, $value);
}
$self->{milestones} = \@milestones;
} }
return $self->{milestones}; return $self->{milestones};
} }
......
editmilestones.cgi
View file @ 3f1a0a81
...@@ -130,8 +130,8 @@ if ($action eq 'new') { ...@@ -130,8 +130,8 @@ if ($action eq 'new') {
$sortkey = Bugzilla::Milestone::check_sort_key($milestone_name, $sortkey = Bugzilla::Milestone::check_sort_key($milestone_name,
$sortkey); $sortkey);
my $milestone = new Bugzilla::Milestone($product->id, my $milestone = new Bugzilla::Milestone(
$milestone_name); { product => $product, name => $milestone_name });
if ($milestone) { if ($milestone) {
ThrowUserError('milestone_already_exists', ThrowUserError('milestone_already_exists',
...@@ -145,8 +145,8 @@ if ($action eq 'new') { ...@@ -145,8 +145,8 @@ if ($action eq 'new') {
VALUES ( ?, ?, ? )', VALUES ( ?, ?, ? )',
undef, $milestone_name, $product->id, $sortkey); undef, $milestone_name, $product->id, $sortkey);
$milestone = new Bugzilla::Milestone($product->id, $milestone = new Bugzilla::Milestone(
$milestone_name); { product => $product, name => $milestone_name });
delete_token($token); delete_token($token);
$vars->{'milestone'} = $milestone; $vars->{'milestone'} = $milestone;
...@@ -301,8 +301,8 @@ if ($action eq 'update') { ...@@ -301,8 +301,8 @@ if ($action eq 'update') {
unless ($milestone_name) { unless ($milestone_name) {
ThrowUserError('milestone_blank_name'); ThrowUserError('milestone_blank_name');
} }
my $milestone = my $milestone = new Bugzilla::Milestone(
new Bugzilla::Milestone($product->id, $milestone_name); { product => $product, name => $milestone_name });
if ($milestone) { if ($milestone) {
ThrowUserError('milestone_already_exists', ThrowUserError('milestone_already_exists',
{'name' => $milestone->name, {'name' => $milestone->name,
......
editproducts.cgi
View file @ 3f1a0a81
...@@ -851,8 +851,8 @@ if ($action eq 'update') { ...@@ -851,8 +851,8 @@ if ($action eq 'update') {
# Only update milestone related stuff if 'usetargetmilestone' is on. # Only update milestone related stuff if 'usetargetmilestone' is on.
if (Bugzilla->params->{'usetargetmilestone'}) { if (Bugzilla->params->{'usetargetmilestone'}) {
my $milestone = new Bugzilla::Milestone($product_old->id, my $milestone = new Bugzilla::Milestone(
$defaultmilestone); { product => $product_old, name => $defaultmilestone });
unless ($milestone) { unless ($milestone) {
ThrowUserError('product_must_define_defaultmilestone', ThrowUserError('product_must_define_defaultmilestone',
......
importxml.pl
View file @ 3f1a0a81
...@@ -692,9 +692,8 @@ sub process_bug { ...@@ -692,9 +692,8 @@ sub process_bug {
# Milestone # Milestone
if ( $params->{"usetargetmilestone"} ) { if ( $params->{"usetargetmilestone"} ) {
my $milestone = my $milestone = new Bugzilla::Milestone(
new Bugzilla::Milestone( $product->id, { product => $product, name => $bug_fields{'target_milestone'} });
$bug_fields{'target_milestone'} );
if ($milestone) { if ($milestone) {
push( @values, $milestone->name ); push( @values, $milestone->name );
} }
......
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