diff options
| -rw-r--r-- | Bugzilla/WebService/Bug.pm | 12 | ||||
| -rw-r--r-- | extensions/GuidedBugEntry/web/js/guided.js | 7 |
2 files changed, 10 insertions, 9 deletions
diff --git a/Bugzilla/WebService/Bug.pm b/Bugzilla/WebService/Bug.pm index f3e075fd2..319df7578 100644 --- a/Bugzilla/WebService/Bug.pm +++ b/Bugzilla/WebService/Bug.pm @@ -1261,8 +1261,6 @@ sub _bug_to_hash { # database call to get the info. my %item = %{ filter $params, { alias => $self->type('string', $bug->alias), - classification => $self->type('string', $bug->classification), - component => $self->type('string', $bug->component), creation_time => $self->type('dateTime', $bug->creation_ts), id => $self->type('int', $bug->bug_id), is_confirmed => $self->type('boolean', $bug->everconfirmed), @@ -1270,7 +1268,6 @@ sub _bug_to_hash { op_sys => $self->type('string', $bug->op_sys), platform => $self->type('string', $bug->rep_platform), priority => $self->type('string', $bug->priority), - product => $self->type('string', $bug->product), resolution => $self->type('string', $bug->resolution), severity => $self->type('string', $bug->bug_severity), status => $self->type('string', $bug->bug_status), @@ -1292,6 +1289,12 @@ sub _bug_to_hash { my @blocks = map { $self->type('int', $_) } @{ $bug->blocked }; $item{'blocks'} = \@blocks; } + if (filter_wants $params, 'classification') { + $item{classification} = $self->type('string', $bug->classification); + } + if (filter_wants $params, 'component') { + $item{component} = $self->type('string', $bug->component); + } if (filter_wants $params, 'cc') { my @cc = map { $self->type('email', $_) } @{ $bug->cc || [] }; $item{'cc'} = \@cc; @@ -1321,6 +1324,9 @@ sub _bug_to_hash { @{ $bug->keyword_objects }; $item{'keywords'} = \@keywords; } + if (filter_wants $params, 'product') { + $item{product} = $self->type('string', $bug->product); + } if (filter_wants $params, 'qa_contact') { my $qa_login = $bug->qa_contact ? $bug->qa_contact->login : ''; $item{'qa_contact'} = $self->type('email', $qa_login); diff --git a/extensions/GuidedBugEntry/web/js/guided.js b/extensions/GuidedBugEntry/web/js/guided.js index b28c59d77..a3888783b 100644 --- a/extensions/GuidedBugEntry/web/js/guided.js +++ b/extensions/GuidedBugEntry/web/js/guided.js @@ -583,12 +583,7 @@ var bugForm = { onInit: function() { var user_agent = navigator.userAgent; - if (YAHOO.env.ua.gecko > 0) { - user_agent += navigator.userAgent.search('Gecko/20100101') != -1 - ? ' (Beta/Release)' - : ' (Nightly/Aurora)'; - } - Dom.get('user_agent').value = user_agent; + Dom.get('user_agent').value = navigator.userAgent; if (navigator.buildID && navigator.buildID != navigator.userAgent) { Dom.get('build_id').value = navigator.buildID; } |