From f6c2d743d87f86cdc206ab4bc772639b4569eebe Mon Sep 17 00:00:00 2001 From: "lpsolit%gmail.com" <> Date: Fri, 2 Jan 2009 13:59:22 +0000 Subject: Bug 313126: Clean up editclassification.cgi and make it use Bugzilla::Classification methods - Patch by Frédéric Buclin r=wicked a=LpSolit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Bugzilla/Classification.pm | 25 +++++++ Bugzilla/User.pm | 16 +--- editclassifications.cgi | 104 ++++---------------------- template/en/default/global/messages.html.tmpl | 22 +++--- 4 files changed, 55 insertions(+), 112 deletions(-) diff --git a/Bugzilla/Classification.pm b/Bugzilla/Classification.pm index 2eb253aa7..7c362bc45 100644 --- a/Bugzilla/Classification.pm +++ b/Bugzilla/Classification.pm @@ -30,6 +30,7 @@ use base qw(Bugzilla::Object); ############################### use constant DB_TABLE => 'classifications'; +use constant LIST_ORDER => 'sortkey, name'; use constant DB_COLUMNS => qw( id @@ -54,6 +55,26 @@ use constant VALIDATORS => { sortkey => \&_check_sortkey, }; +############################### +#### Constructors ##### +############################### +sub remove_from_db { + my $self = shift; + my $dbh = Bugzilla->dbh; + + ThrowUserError("classification_not_deletable") if ($self->id == 1); + + $dbh->bz_start_transaction(); + # Reclassify products to the default classification, if needed. + $dbh->do("UPDATE products SET classification_id = 1 + WHERE classification_id = ?", undef, $self->id); + + $dbh->do("DELETE FROM classifications WHERE id = ?", undef, $self->id); + + $dbh->bz_commit_transaction(); + +} + ############################### #### Validators #### ############################### @@ -93,6 +114,10 @@ sub _check_sortkey { #### Methods #### ############################### +sub set_name { $_[0]->set('name', $_[1]); } +sub set_description { $_[0]->set('description', $_[1]); } +sub set_sortkey { $_[0]->set('sortkey', $_[1]); } + sub product_count { my $self = shift; my $dbh = Bugzilla->dbh; diff --git a/Bugzilla/User.pm b/Bugzilla/User.pm index 5c4c8621c..0c0f45bc0 100644 --- a/Bugzilla/User.pm +++ b/Bugzilla/User.pm @@ -682,20 +682,12 @@ sub get_selectable_products { sub get_selectable_classifications { my ($self) = @_; - if (defined $self->{selectable_classifications}) { - return $self->{selectable_classifications}; - } - - my $products = $self->get_selectable_products; + if (!defined $self->{selectable_classifications}) { + my $products = $self->get_selectable_products; + my %class_ids = map { $_->classification_id => 1 } @$products; - my $class; - foreach my $product (@$products) { - $class->{$product->classification_id} ||= - new Bugzilla::Classification($product->classification_id); + $self->{selectable_classifications} = Bugzilla::Classification->new_from_list([keys %class_ids]); } - my @sorted_class = sort {$a->sortkey <=> $b->sortkey - || lc($a->name) cmp lc($b->name)} (values %$class); - $self->{selectable_classifications} = \@sorted_class; return $self->{selectable_classifications}; } diff --git a/editclassifications.cgi b/editclassifications.cgi index f2a91a68e..61b014c8d 100755 --- a/editclassifications.cgi +++ b/editclassifications.cgi @@ -100,34 +100,15 @@ if ($action eq 'add') { if ($action eq 'new') { check_token_data($token, 'add_classification'); - $class_name || ThrowUserError("classification_not_specified"); - my $classification = - new Bugzilla::Classification({name => $class_name}); - - if ($classification) { - ThrowUserError("classification_already_exists", - { name => $classification->name }); - } - - my $description = trim($cgi->param('description') || ''); - - my $sortkey = trim($cgi->param('sortkey') || 0); - my $stored_sortkey = $sortkey; - detaint_natural($sortkey) - || ThrowUserError('classification_invalid_sortkey', {'sortkey' => $stored_sortkey}); - - trick_taint($description); - trick_taint($class_name); - - # Add the new classification. - $dbh->do("INSERT INTO classifications (name, description, sortkey) - VALUES (?, ?, ?)", undef, ($class_name, $description, $sortkey)); + Bugzilla::Classification->create({name => $class_name, + description => scalar $cgi->param('description'), + sortkey => scalar $cgi->param('sortkey')}); delete_token($token); $vars->{'message'} = 'classification_created'; - $vars->{'classification'} = new Bugzilla::Classification({name => $class_name}); + $vars->{'classification'} = $classification; $vars->{'classifications'} = [Bugzilla::Classification->get_all]; $vars->{'token'} = issue_session_token('reclassify_classifications'); LoadTemplate('reclassify'); @@ -165,27 +146,11 @@ if ($action eq 'delete') { check_token_data($token, 'delete_classification'); my $classification = Bugzilla::Classification->check($class_name); - - if ($classification->id == 1) { - ThrowUserError("classification_not_deletable"); - } - - # lock the tables before we start to change everything: - $dbh->bz_start_transaction(); - - # update products just in case - $dbh->do("UPDATE products SET classification_id = 1 - WHERE classification_id = ?", undef, $classification->id); - - # delete - $dbh->do("DELETE FROM classifications WHERE id = ?", undef, - $classification->id); - - $dbh->bz_commit_transaction(); + $classification->remove_from_db; + delete_token($token); $vars->{'message'} = 'classification_deleted'; - $vars->{'classification'} = $class_name; - delete_token($token); + $vars->{'classification'} = $classification; LoadTemplate('select'); } @@ -196,7 +161,6 @@ if ($action eq 'delete') { # if ($action eq 'edit') { - my $classification = Bugzilla::Classification->check($class_name); $vars->{'classification'} = $classification; @@ -212,57 +176,19 @@ if ($action eq 'edit') { if ($action eq 'update') { check_token_data($token, 'edit_classification'); - $class_name || ThrowUserError("classification_not_specified"); - my $class_old_name = trim($cgi->param('classificationold') || ''); + my $classification = Bugzilla::Classification->check($class_old_name); - my $class_old = Bugzilla::Classification->check($class_old_name); - - my $description = trim($cgi->param('description') || ''); - - my $sortkey = trim($cgi->param('sortkey') || 0); - my $stored_sortkey = $sortkey; - detaint_natural($sortkey) - || ThrowUserError('classification_invalid_sortkey', {'sortkey' => $stored_sortkey}); - - $dbh->bz_start_transaction(); - - if ($class_name ne $class_old->name) { - - my $class = new Bugzilla::Classification({name => $class_name}); - if ($class) { - ThrowUserError("classification_already_exists", - { name => $class->name }); - } - trick_taint($class_name); - $dbh->do("UPDATE classifications SET name = ? WHERE id = ?", - undef, ($class_name, $class_old->id)); - - $vars->{'updated_classification'} = 1; - } + $classification->set_name($class_name); + $classification->set_description(scalar $cgi->param('description')); + $classification->set_sortkey(scalar $cgi->param('sortkey')); - if ($description ne $class_old->description) { - trick_taint($description); - $dbh->do("UPDATE classifications SET description = ? - WHERE id = ?", undef, - ($description, $class_old->id)); - - $vars->{'updated_description'} = 1; - } - - if ($sortkey ne $class_old->sortkey) { - $dbh->do("UPDATE classifications SET sortkey = ? - WHERE id = ?", undef, - ($sortkey, $class_old->id)); - - $vars->{'updated_sortkey'} = 1; - } - - $dbh->bz_commit_transaction(); + my $changes = $classification->update; + delete_token($token); $vars->{'message'} = 'classification_updated'; - $vars->{'classification'} = $class_name; - delete_token($token); + $vars->{'classification'} = $classification; + $vars->{'changes'} = $changes; LoadTemplate('select'); } diff --git a/template/en/default/global/messages.html.tmpl b/template/en/default/global/messages.html.tmpl index 5e2eaef00..f72acff1a 100644 --- a/template/en/default/global/messages.html.tmpl +++ b/template/en/default/global/messages.html.tmpl @@ -186,26 +186,26 @@ [% ELSIF message_tag == "classification_deleted" %] [% title = "Classification Deleted" %] - The [% classification FILTER html %] classification has been deleted. + The [% classification.name FILTER html %] classification has been deleted. [% ELSIF message_tag == "classification_updated" %] - [% IF updated_classification || updated_description || updated_sortkey %] - [% title = "Classification Updated" %] - Changes to the [% classification FILTER html %] classification + [% title = "Classification Updated" %] + [% IF changes.keys.size %] + Changes to the [% classification.name FILTER html %] classification have been saved: [% ELSE %] - No changes made to [% classification FILTER html %]. + No changes made to [% classification.name FILTER html %]. [% END %] [% ELSIF message_tag == "component_created" %] -- cgit v1.2.3-24-g4f1b