summaryrefslogtreecommitdiffstats
path: root/Bugzilla
diff options
context:
space:
mode:
authorChristian Legnitto <clegnitto@mozilla.com>2010-11-03 16:33:30 +0100
committerFrédéric Buclin <LpSolit@gmail.com>2010-11-03 16:33:30 +0100
commit476aa64420a21efc15d50857c2ebbad3fb5de6db (patch)
tree883248089fa751f7234e537227575d9735d5c1d9 /Bugzilla
parenta8a6e226052b940268bd0dd8e0767d3ad516d773 (diff)
downloadbugzilla-476aa64420a21efc15d50857c2ebbad3fb5de6db.tar.gz
bugzilla-476aa64420a21efc15d50857c2ebbad3fb5de6db.tar.xz
Bug 607909: Hours worked / work_time is marked as changing when commenting even when you don't enter a value
r/a=LpSolit
Diffstat (limited to 'Bugzilla')
-rw-r--r--Bugzilla/Bug.pm4
-rw-r--r--Bugzilla/Comment.pm6
2 files changed, 7 insertions, 3 deletions
diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index e005b05c5..f5b092800 100644
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -895,8 +895,8 @@ sub update {
# timestamp.
$comment->{bug_when} = $delta_ts;
$comment = Bugzilla::Comment->insert_create_data($comment);
- if ($comment->{work_time}) {
- LogActivityEntry($self->id, "work_time", "", $comment->{work_time},
+ if ($comment->work_time) {
+ LogActivityEntry($self->id, "work_time", "", $comment->work_time,
Bugzilla->user->id, $delta_ts);
}
}
diff --git a/Bugzilla/Comment.pm b/Bugzilla/Comment.pm
index e8bdb4e89..7b9e257df 100644
--- a/Bugzilla/Comment.pm
+++ b/Bugzilla/Comment.pm
@@ -113,7 +113,11 @@ sub body { return $_[0]->{'thetext'}; }
sub bug_id { return $_[0]->{'bug_id'}; }
sub creation_ts { return $_[0]->{'bug_when'}; }
sub is_private { return $_[0]->{'isprivate'}; }
-sub work_time { return $_[0]->{'work_time'}; }
+sub work_time {
+ # Work time is returned as a string (see bug 607909)
+ return 0 if $_[0]->{'work_time'} + 0 == 0;
+ return $_[0]->{'work_time'};
+}
sub type { return $_[0]->{'type'}; }
sub extra_data { return $_[0]->{'extra_data'} }