Commit 4c622071 authored by Max Kanat-Alexander's avatar Max Kanat-Alexander

Bug 554536: [WebService] Make Bug.fields not send the "values" item for

fields that don't have a list of values r=dkl, a=mkanat
parent 52c568cc
...@@ -98,10 +98,11 @@ sub fields { ...@@ -98,10 +98,11 @@ sub fields {
my $value_field = $field->value_field my $value_field = $field->value_field
? $field->value_field->name : undef; ? $field->value_field->name : undef;
my @values; my (@values, $has_values);
if ( ($field->is_select and $field->name ne 'product') if ( ($field->is_select and $field->name ne 'product')
or grep($_ eq $field->name, PRODUCT_SPECIFIC_FIELDS)) or grep($_ eq $field->name, PRODUCT_SPECIFIC_FIELDS))
{ {
$has_values = 1;
@values = @{ $self->_legal_field_values({ field => $field }) }; @values = @{ $self->_legal_field_values({ field => $field }) };
} }
...@@ -109,7 +110,7 @@ sub fields { ...@@ -109,7 +110,7 @@ sub fields {
$value_field = 'product'; $value_field = 'product';
} }
push (@fields_out, filter $params, { my %field_data = (
id => $self->type('int', $field->id), id => $self->type('int', $field->id),
type => $self->type('int', $field->type), type => $self->type('int', $field->type),
is_custom => $self->type('boolean', $field->custom), is_custom => $self->type('boolean', $field->custom),
...@@ -118,9 +119,12 @@ sub fields { ...@@ -118,9 +119,12 @@ sub fields {
is_on_bug_entry => $self->type('boolean', $field->enter_bug), is_on_bug_entry => $self->type('boolean', $field->enter_bug),
visibility_field => $self->type('string', $visibility_field), visibility_field => $self->type('string', $visibility_field),
visibility_values => [$self->type('string', $visibility_value)], visibility_values => [$self->type('string', $visibility_value)],
value_field => $self->type('string', $value_field), );
values => \@values, if ($has_values) {
}); $field_data{value_field} = $self->type('string', $value_field);
$field_data{values} = \@values;
};
push(@fields_out, filter $params, \%field_data);
} }
return { fields => \@fields_out }; return { fields => \@fields_out };
......
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