From 5435127bfddb56df7425a5b095857e8a1fd1daea Mon Sep 17 00:00:00 2001 From: "lpsolit%gmail.com" Date: Sat, 26 Aug 2006 17:40:20 +0000 Subject: [PATCH] =?UTF-8?q?Bug=20349368:=20Allow=20custom=20fields=20to=20?= =?UTF-8?q?be=20edited=20from=20editfields.cgi=20-=20Patch=20by=20Fr?= =?UTF-8?q?=EF=BF=BDd=EF=BF=BDric=20Buclin=20=20r=3Dmka?= =?UTF-8?q?nat=20a=3Djustdave?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- webtools/bugzilla/Bugzilla/Field.pm | 37 +++++++++----- webtools/bugzilla/editfields.cgi | 48 +++++++++++++++++-- .../admin/custom_fields/edit.html.tmpl | 2 +- .../en/default/global/messages.html.tmpl | 5 ++ 4 files changed, 75 insertions(+), 17 deletions(-) diff --git a/webtools/bugzilla/Bugzilla/Field.pm b/webtools/bugzilla/Bugzilla/Field.pm index cd510471d67..870e93221d2 100644 --- a/webtools/bugzilla/Bugzilla/Field.pm +++ b/webtools/bugzilla/Bugzilla/Field.pm @@ -284,7 +284,7 @@ Params: This function takes named parameters in a hashref: C - boolean - Whether this field appears at the top of the bugmail for a newly-filed bug. - The following parameters are only available on field creation: + The following parameters are optional: C - boolean - True if this is a Custom Field. The field will be added to the C table if it does not exist. C - integer - The sortkey of the field. @@ -300,28 +300,43 @@ Returns: a C object. sub create_or_update { my ($params) = @_; + my $dbh = Bugzilla->dbh; - my $custom = $params->{custom} ? 1 : 0; my $name = $params->{name}; + my $custom = $params->{custom} ? 1 : 0; my $in_new_bugmail = $params->{in_new_bugmail} ? 1 : 0; - my $sortkey = $params->{sortkey} || 0; - my $enter_bug = $params->{editable_on_enter_bug} ? 1 : 0; - my $is_obsolete = $params->{is_obsolete} ? 1 : 0; - # Some day we'll allow invocants to specify the field type. # We don't care about $params->{type} yet. my $type = $custom ? FIELD_TYPE_FREETEXT : FIELD_TYPE_UNKNOWN; my $field = new Bugzilla::Field({name => $name}); - - my $dbh = Bugzilla->dbh; if ($field) { + # Both fields are mandatory. + my @columns = ('description', 'mailhead'); + my @values = ($params->{desc}, $in_new_bugmail); + + if (exists $params->{sortkey}) { + push(@columns, 'sortkey'); + push(@values, $params->{sortkey} || 0); + } + if (exists $params->{editable_on_enter_bug}) { + push(@columns, 'enter_bug'); + push(@values, $params->{editable_on_enter_bug} ? 1 : 0); + } + if (exists $params->{is_obsolete}) { + push(@columns, 'obsolete'); + push(@values, $params->{is_obsolete} ? 1 : 0); + } + my $columns = join(', ', map {"$_ = ?"} @columns); # Update the already-existing definition. - $dbh->do("UPDATE fielddefs SET description = ?, mailhead = ? - WHERE id = ?", - undef, $params->{desc}, $in_new_bugmail, $field->id); + $dbh->do("UPDATE fielddefs SET $columns WHERE id = ?", + undef, (@values, $field->id)); } else { + my $sortkey = $params->{sortkey} || 0; + my $enter_bug = $params->{editable_on_enter_bug} ? 1 : 0; + my $is_obsolete = $params->{is_obsolete} ? 1 : 0; + $sortkey ||= $dbh->selectrow_array( "SELECT MAX(sortkey) + 100 FROM fielddefs") || 100; diff --git a/webtools/bugzilla/editfields.cgi b/webtools/bugzilla/editfields.cgi index 1a70244336f..d9f611a9650 100644 --- a/webtools/bugzilla/editfields.cgi +++ b/webtools/bugzilla/editfields.cgi @@ -98,17 +98,55 @@ elsif ($action eq 'new') { } elsif ($action eq 'edit') { my $name = $cgi->param('name') || ThrowUserError('customfield_missing_name'); - trick_taint($name); - my @field = Bugzilla->get_fields({'name' => $name, 'custom' => 1}); - scalar(@field) || ThrowUserError('customfield_nonexistent', {'name' => $name}); + # Custom field names must start with "cf_". + if ($name !~ /^cf_/) { + $name = 'cf_' . $name; + } + my $field = new Bugzilla::Field({'name' => $name}); + $field || ThrowUserError('customfield_nonexistent', {'name' => $name}); - $vars->{'field'} = $field[0]; + $vars->{'field'} = $field; $template->process('admin/custom_fields/edit.html.tmpl', $vars) || ThrowTemplateError($template->error()); } elsif ($action eq 'update') { - die "not yet implemented...\n"; + my $name = $cgi->param('name'); + my $desc = clean_text($cgi->param('desc') || ''); + my $sortkey = $cgi->param('sortkey') || 0; + + # Validate fields. + $name || ThrowUserError('customfield_missing_name'); + # Custom field names must start with "cf_". + if ($name !~ /^cf_/) { + $name = 'cf_' . $name; + } + my $field = new Bugzilla::Field({'name' => $name}); + $field || ThrowUserError('customfield_nonexistent', {'name' => $name}); + + $desc || ThrowUserError('customfield_missing_description', {'name' => $name}); + trick_taint($desc); + + my $skey = $sortkey; + detaint_natural($sortkey) + || ThrowUserError('customfield_invalid_sortkey', {'name' => $name, + 'sortkey' => $skey}); + + $vars->{'name'} = $field->name; + $vars->{'desc'} = $desc; + $vars->{'sortkey'} = $sortkey; + $vars->{'custom'} = 1; + $vars->{'in_new_bugmail'} = $cgi->param('new_bugmail') ? 1 : 0; + $vars->{'editable_on_enter_bug'} = $cgi->param('enter_bug') ? 1 : 0; + $vars->{'is_obsolete'} = $cgi->param('obsolete') ? 1 : 0; + + Bugzilla::Field::create_or_update($vars); + + $vars->{'custom_fields'} = [Bugzilla->get_fields({'custom' => 1})]; + $vars->{'message'} = 'custom_field_updated'; + + $template->process('admin/custom_fields/list.html.tmpl', $vars) + || ThrowTemplateError($template->error()); } elsif ($action eq 'del') { die "not yet implemented...\n"; diff --git a/webtools/bugzilla/template/en/default/admin/custom_fields/edit.html.tmpl b/webtools/bugzilla/template/en/default/admin/custom_fields/edit.html.tmpl index cb7b56a0a27..def825e7c56 100644 --- a/webtools/bugzilla/template/en/default/admin/custom_fields/edit.html.tmpl +++ b/webtools/bugzilla/template/en/default/admin/custom_fields/edit.html.tmpl @@ -89,7 +89,7 @@
- +

diff --git a/webtools/bugzilla/template/en/default/global/messages.html.tmpl b/webtools/bugzilla/template/en/default/global/messages.html.tmpl index cdc5158cf6d..4a7c4591c1e 100644 --- a/webtools/bugzilla/template/en/default/global/messages.html.tmpl +++ b/webtools/bugzilla/template/en/default/global/messages.html.tmpl @@ -165,6 +165,11 @@ The new custom field '[% name FILTER html %]' has been successfully created. + [% ELSIF message_tag == "custom_field_updated" %] + [% title = "Custom Field Updated" %] + Properties of the '[% name FILTER html %]' field have been + successfully updated. + [% ELSIF message_tag == "emailold_change_cancelled" %] [% title = "Cancel Request to Change Email Address" %] The request to change the email address for your account to