summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorByron Jones <bjones@mozilla.com>2013-11-18 15:24:39 +0100
committerByron Jones <bjones@mozilla.com>2013-11-18 15:24:39 +0100
commitac6167f3a698dc8c142d0808fcd7aaa0f00e1f65 (patch)
tree7013cadf9d60edacdf45242a1829a78d2b1329b7
parent17b7781c6178e67375edd37907be3eaee72b84d6 (diff)
downloadbugzilla-ac6167f3a698dc8c142d0808fcd7aaa0f00e1f65.tar.gz
bugzilla-ac6167f3a698dc8c142d0808fcd7aaa0f00e1f65.tar.xz
Bug 937180: creation_ts of bugs and attachments always at 0 seconds
r=dkl, a=simon
-rw-r--r--Bugzilla/Attachment.pm29
-rw-r--r--Bugzilla/Bug.pm2
-rw-r--r--template/en/default/attachment/list.html.tmpl2
-rw-r--r--template/en/default/bug/edit.html.tmpl4
4 files changed, 17 insertions, 20 deletions
diff --git a/Bugzilla/Attachment.pm b/Bugzilla/Attachment.pm
index 92e05e606..ef4785633 100644
--- a/Bugzilla/Attachment.pm
+++ b/Bugzilla/Attachment.pm
@@ -59,22 +59,19 @@ use constant LIST_ORDER => ID_FIELD;
use constant AUDIT_CREATES => 0;
use constant AUDIT_UPDATES => 0;
-sub DB_COLUMNS {
- my $dbh = Bugzilla->dbh;
-
- return qw(
- attach_id
- bug_id
- description
- filename
- isobsolete
- ispatch
- isprivate
- mimetype
- modification_time
- submitter_id),
- $dbh->sql_date_format('attachments.creation_ts', '%Y.%m.%d %H:%i') . ' AS creation_ts';
-}
+use constant DB_COLUMNS => qw(
+ attach_id
+ bug_id
+ creation_ts
+ description
+ filename
+ isobsolete
+ ispatch
+ isprivate
+ mimetype
+ modification_time
+ submitter_id
+);
use constant REQUIRED_FIELD_MAP => {
bug_id => 'bug',
diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index 88f1f18bc..1e82da30d 100644
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -71,6 +71,7 @@ sub DB_COLUMNS {
bug_status
cclist_accessible
component_id
+ creation_ts
delta_ts
estimated_time
everconfirmed
@@ -89,7 +90,6 @@ sub DB_COLUMNS {
version
),
'reporter AS reporter_id',
- $dbh->sql_date_format('creation_ts', '%Y.%m.%d %H:%i') . ' AS creation_ts',
$dbh->sql_date_format('deadline', '%Y-%m-%d') . ' AS deadline',
@custom_names);
diff --git a/template/en/default/attachment/list.html.tmpl b/template/en/default/attachment/list.html.tmpl
index 9c9247980..48921e3ca 100644
--- a/template/en/default/attachment/list.html.tmpl
+++ b/template/en/default/attachment/list.html.tmpl
@@ -88,7 +88,7 @@ function toggle_display(link) {
<br>
<a href="#attach_[% attachment.id %]"
title="Go to the comment associated with the attachment">
- [%- attachment.attached FILTER time %]</a>,
+ [%- attachment.attached FILTER time("%Y-%m-%d %H:%M %Z") %]</a>,
[%# No need to recreate the exact same template if we already have it. %]
[% attacher_id = attachment.attacher.id %]
diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index acdcdbf7a..a6857f0d5 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -711,7 +711,7 @@
Reported:
</th>
<td>
- [% bug.creation_ts FILTER time %] by [% INCLUDE global/user.html.tmpl who = bug.reporter %]
+ [% bug.creation_ts FILTER time("%Y-%m-%d %H:%M %Z") %] by [% INCLUDE global/user.html.tmpl who = bug.reporter %]
</td>
</tr>
@@ -720,7 +720,7 @@
Modified:
</th>
<td>
- [% bug.delta_ts FILTER time FILTER replace(':\d\d$', '') FILTER replace(':\d\d ', ' ')%]
+ [% bug.delta_ts FILTER time("%Y-%m-%d %H:%M %Z") %]
(<a href="show_activity.cgi?id=[% bug.bug_id %]">[%# terms.Bug %]History</a>)
</td>