diff options
Diffstat (limited to 'Bugzilla')
| -rw-r--r-- | Bugzilla/Bug.pm | 10 | ||||
| -rw-r--r-- | Bugzilla/DB/Schema.pm | 2 | ||||
| -rw-r--r-- | Bugzilla/Install/DB.pm | 10 | ||||
| -rw-r--r-- | Bugzilla/Product.pm | 6 |
4 files changed, 6 insertions, 22 deletions
diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm index 2c3a11e8c..9768dede4 100644 --- a/Bugzilla/Bug.pm +++ b/Bugzilla/Bug.pm @@ -1972,7 +1972,6 @@ sub set_product { $self->{_old_product_name} = $old_product->name; # Delete fields that depend upon the old Product value. delete $self->{choices}; - delete $self->{milestoneurl}; $product_changed = 1; } @@ -2734,15 +2733,6 @@ sub comments { return \@comments; } -sub milestoneurl { - my ($self) = @_; - return $self->{'milestoneurl'} if exists $self->{'milestoneurl'}; - return '' if $self->{'error'}; - - $self->{'milestoneurl'} = $self->product_obj->milestone_url; - return $self->{'milestoneurl'}; -} - sub product { my ($self) = @_; return $self->{product} if exists $self->{product}; diff --git a/Bugzilla/DB/Schema.pm b/Bugzilla/DB/Schema.pm index a2df26425..e4dcfd966 100644 --- a/Bugzilla/DB/Schema.pm +++ b/Bugzilla/DB/Schema.pm @@ -1214,8 +1214,6 @@ use constant ABSTRACT_SCHEMA => { COLUMN => 'id', DELETE => 'CASCADE'}}, description => {TYPE => 'MEDIUMTEXT'}, - milestoneurl => {TYPE => 'TINYTEXT', NOTNULL => 1, - DEFAULT => "''"}, isactive => {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 1}, votesperuser => {TYPE => 'INT2', NOTNULL => 1, diff --git a/Bugzilla/Install/DB.pm b/Bugzilla/Install/DB.pm index 74668a3bb..0d117bc12 100644 --- a/Bugzilla/Install/DB.pm +++ b/Bugzilla/Install/DB.pm @@ -459,8 +459,10 @@ sub update_table_definitions { _move_data_nomail_into_db(); # The products table lacked sensible defaults. - $dbh->bz_alter_column('products', 'milestoneurl', - {TYPE => 'TINYTEXT', NOTNULL => 1, DEFAULT => "''"}); + if ($dbh->bz_column_info('products', 'milestoneurl') { + $dbh->bz_alter_column('products', 'milestoneurl', + {TYPE => 'TINYTEXT', NOTNULL => 1, DEFAULT => "''"}); + } if ($dbh->bz_column_info('products', 'disallownew')){ $dbh->bz_alter_column('products', 'disallownew', {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 0}); @@ -588,6 +590,8 @@ sub update_table_definitions { _set_attachment_comment_types(); + $dbh->bz_drop_column('products', 'milestoneurl'); + ################################################################ # New --TABLE-- changes should go *** A B O V E *** this point # ################################################################ @@ -623,8 +627,6 @@ sub _update_pre_checksetup_bugzillas { {TYPE => 'BOOLEAN', NOTNULL => 1}, 0); } - $dbh->bz_add_column('products', 'milestoneurl', - {TYPE => 'TINYTEXT', NOTNULL => 1}, ''); $dbh->bz_add_column('components', 'initialqacontact', {TYPE => 'TINYTEXT'}); $dbh->bz_add_column('components', 'description', diff --git a/Bugzilla/Product.pm b/Bugzilla/Product.pm index ac2bd4d72..410f1bd20 100644 --- a/Bugzilla/Product.pm +++ b/Bugzilla/Product.pm @@ -53,7 +53,6 @@ use constant DB_COLUMNS => qw( name classification_id description - milestoneurl isactive votesperuser maxvotesperbug @@ -71,7 +70,6 @@ use constant UPDATE_COLUMNS => qw( name description defaultmilestone - milestoneurl isactive votesperuser maxvotesperbug @@ -84,7 +82,6 @@ use constant VALIDATORS => { description => \&_check_description, version => \&_check_version, defaultmilestone => \&_check_default_milestone, - milestoneurl => \&_check_milestone_url, isactive => \&Bugzilla::Object::check_boolean, votesperuser => \&_check_votes_per_user, maxvotesperbug => \&_check_votes_per_bug, @@ -630,7 +627,6 @@ sub _create_series { sub set_name { $_[0]->set('name', $_[1]); } sub set_description { $_[0]->set('description', $_[1]); } sub set_default_milestone { $_[0]->set('defaultmilestone', $_[1]); } -sub set_milestone_url { $_[0]->set('milestoneurl', $_[1]); } sub set_is_active { $_[0]->set('isactive', $_[1]); } sub set_votes_per_user { $_[0]->set('votesperuser', $_[1]); } sub set_votes_per_bug { $_[0]->set('maxvotesperbug', $_[1]); } @@ -887,7 +883,6 @@ sub flag_types { ############################### sub description { return $_[0]->{'description'}; } -sub milestone_url { return $_[0]->{'milestoneurl'}; } sub is_active { return $_[0]->{'isactive'}; } sub votes_per_user { return $_[0]->{'votesperuser'}; } sub max_votes_per_bug { return $_[0]->{'maxvotesperbug'}; } @@ -940,7 +935,6 @@ Bugzilla::Product - Bugzilla product class. my $id = $product->id; my $name = $product->name; my $description = $product->description; - my $milestoneurl = $product->milestone_url; my isactive = $product->is_active; my votesperuser = $product->votes_per_user; my maxvotesperbug = $product->max_votes_per_bug; |