diff options
author | mkanat%bugzilla.org <> | 2007-11-05 02:17:57 +0100 |
---|---|---|
committer | mkanat%bugzilla.org <> | 2007-11-05 02:17:57 +0100 |
commit | 9f774e4a6de07003873bb20a68989d8e7f6fd544 (patch) | |
tree | a28d0a8a4caebf0a1d3e9fc9ca58effac54ae5c2 /process_bug.cgi | |
parent | 682cf8e706eac2deaf67dbce67bd6f775dd5e216 (diff) | |
download | bugzilla-9f774e4a6de07003873bb20a68989d8e7f6fd544.tar.gz bugzilla-9f774e4a6de07003873bb20a68989d8e7f6fd544.tar.xz |
Bug 401953: Move work_time validation from process_bug to Bugzilla::Bug
Patch By Max Kanat-Alexander <mkanat@bugzilla.org> r=LpSolit, a=LpSolit
Diffstat (limited to 'process_bug.cgi')
-rwxr-xr-x | process_bug.cgi | 29 |
1 files changed, 2 insertions, 27 deletions
diff --git a/process_bug.cgi b/process_bug.cgi index d7fee8199..027965f05 100755 --- a/process_bug.cgi +++ b/process_bug.cgi @@ -164,21 +164,6 @@ $cgi->param('dontchange','') unless defined $cgi->param('dontchange'); # Make sure the 'knob' param is defined; else set it to 'none'. $cgi->param('knob', 'none') unless defined $cgi->param('knob'); -# Validate work_time -if (defined $cgi->param('work_time') - && $cgi->param('work_time') ne $cgi->param('dontchange')) -{ - $cgi->param('work_time', $bug->_check_time($cgi->param('work_time'), - 'work_time')); -} - -if (Bugzilla->user->in_group(Bugzilla->params->{'timetrackinggroup'})) { - my $wk_time = $cgi->param('work_time'); - if (!comment_exists() && $wk_time && $wk_time != 0) { - ThrowUserError('comment_required'); - } -} - $cgi->param('comment', $bug->_check_comment($cgi->param('comment'))); # If the bug(s) being modified have dependencies, validate them @@ -927,17 +912,12 @@ foreach my $id (@idlist) { exit; } - my $work_time; - if (Bugzilla->user->in_group(Bugzilla->params->{'timetrackinggroup'})) { - $work_time = $cgi->param('work_time'); - } - - if ($cgi->param('comment') || $work_time || $duplicate) { + if ($cgi->param('comment') || $cgi->param('work_time') || $duplicate) { my $type = $duplicate ? CMT_DUPE_OF : CMT_NORMAL; $bug_objects{$id}->add_comment(scalar($cgi->param('comment')), { isprivate => scalar($cgi->param('commentprivacy')), - work_time => $work_time, type => $type, + work_time => scalar $cgi->param('work_time'), type => $type, extra_data => $duplicate}); $bug_changed = 1; } @@ -948,11 +928,6 @@ foreach my $id (@idlist) { $timestamp = $dbh->selectrow_array(q{SELECT NOW()}); - if ($work_time) { - LogActivityEntry($id, "work_time", "", $work_time, - $whoid, $timestamp); - } - $bug_objects{$id}->update($timestamp); $bug_objects{$id}->update_keywords($timestamp); |