summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorByron Jones <glob@mozilla.com>2015-02-05 08:48:45 +0100
committerByron Jones <glob@mozilla.com>2015-02-05 08:48:45 +0100
commitfab413294929ea13ba3fa4063bb0c4a9ee91464c (patch)
treeeb52cbab39d9448b2f15c3192dfdf478364a0035
parent7732e14a3655a4cdbaff1846bda8cb4a30303de9 (diff)
downloadbugzilla-fab413294929ea13ba3fa4063bb0c4a9ee91464c.tar.gz
bugzilla-fab413294929ea13ba3fa4063bb0c4a9ee91464c.tar.xz
Bug 813630: Last resolved time is displayed in server timezone not as per user preferences
-rw-r--r--extensions/InlineHistory/Extension.pm1
-rw-r--r--extensions/InlineHistory/template/en/default/hook/bug/comments-aftercomments.html.tmpl2
2 files changed, 3 insertions, 0 deletions
diff --git a/extensions/InlineHistory/Extension.pm b/extensions/InlineHistory/Extension.pm
index 4cff558c7..c48405eb9 100644
--- a/extensions/InlineHistory/Extension.pm
+++ b/extensions/InlineHistory/Extension.pm
@@ -106,6 +106,7 @@ sub template_before_process {
my $field_obj;
if ($change->{fieldname} =~ /^cf_/) {
$field_obj = Bugzilla::Field->new({ name => $change->{fieldname}, cache => 1 });
+ $change->{fieldtype} = $field_obj->type;
}
# identify buglist changes
diff --git a/extensions/InlineHistory/template/en/default/hook/bug/comments-aftercomments.html.tmpl b/extensions/InlineHistory/template/en/default/hook/bug/comments-aftercomments.html.tmpl
index d9871e43f..fb5d25225 100644
--- a/extensions/InlineHistory/template/en/default/hook/bug/comments-aftercomments.html.tmpl
+++ b/extensions/InlineHistory/template/en/default/hook/bug/comments-aftercomments.html.tmpl
@@ -157,6 +157,8 @@
change.fieldname == 'cc' ||
change.fieldname == 'flagtypes.name' %]
[% value FILTER email FILTER js %]
+ [% ELSIF change.fieldtype == constants.FIELD_TYPE_DATETIME %]
+ [% value FILTER time FILTER js %]
[% ELSE %]
[% value FILTER ih_short_value FILTER html FILTER js %]
[% END %]