diff options
| author | Kent Rogers <kar@cray.com> | 2010-05-13 08:29:58 +0200 |
|---|---|---|
| committer | Max Kanat-Alexander <mkanat@bugzilla.org> | 2010-05-13 08:29:58 +0200 |
| commit | 34e9970696a7dd34bc21cea973d2ad3696440792 (patch) | |
| tree | 93dac67b52960399e537ad5819923cb908b4a142 | |
| parent | 20ed8a92744b90c7b6b5eab19d0ed7e846100a5e (diff) | |
| download | bugzilla-34e9970696a7dd34bc21cea973d2ad3696440792.tar.gz bugzilla-34e9970696a7dd34bc21cea973d2ad3696440792.tar.xz | |
Bug 271913: Do not force the user to comment when adding Hours Worked
r=mkanat, a=mkanat
| -rw-r--r-- | Bugzilla/Bug.pm | 8 | ||||
| -rw-r--r-- | template/en/default/bug/comments.html.tmpl | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm index b9c64da7f..1b7753eff 100644 --- a/Bugzilla/Bug.pm +++ b/Bugzilla/Bug.pm @@ -2243,11 +2243,7 @@ sub add_comment { $comment = $self->_check_comment($comment); $params ||= {}; - if (exists $params->{work_time}) { - $params->{work_time} = $self->_check_work_time($params->{work_time}); - ThrowUserError('comment_required') - if $comment eq '' && $params->{work_time} != 0; - } + $params->{work_time} = $self->_check_work_time($params->{work_time}); if (exists $params->{type}) { $params->{type} = $self->_check_comment_type($params->{type}); } @@ -2257,7 +2253,7 @@ sub add_comment { } # XXX We really should check extra_data, too. - if ($comment eq '' && !($params->{type} || $params->{work_time})) { + if ($comment eq '' && !($params->{type} || abs($params->{work_time}))) { return; } diff --git a/template/en/default/bug/comments.html.tmpl b/template/en/default/bug/comments.html.tmpl index 93b954e87..3012bab5e 100644 --- a/template/en/default/bug/comments.html.tmpl +++ b/template/en/default/bug/comments.html.tmpl @@ -94,6 +94,7 @@ [% DEFAULT start_at = 0 mode = "show" %] +[% timetracking_only = (comment_body == '' && comment.work_time != 0) %] [% sort_order = user.settings.comment_sort_order.value %] [%# NOTE: (start_at > 0) means we came here from a midair collision, @@ -157,6 +158,7 @@ [% BLOCK a_comment %] [% RETURN IF comment.is_private AND ! user.is_insider %] + [% RETURN IF timetracking_only AND !user.in_group(Param('timetrackinggroup')) %] <div id="c[% count %]" class="bz_comment[% " bz_private" IF comment.is_private %] [% " bz_comment_hilite" IF marks.$count %] |