Skip to content

bugzilla
bugzilla
Commit f9e05e27 authored by bbaetz%student.usyd.edu.au's avatar bbaetz%student.usyd.edu.au
Browse files
Options

Bug 24823 - show the last modified date at the top of show_bug

Patch by vkissoyan@yahoo.com (Vaskin Kissoyan) r=bbaetz x2
parent 9b22dcde
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 4 deletions
bug_form.pl
View file @ f9e05e27
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
# #
# Contributor(s): Terry Weissman <terry@mozilla.org> # Contributor(s): Terry Weissman <terry@mozilla.org>
# Dave Miller <justdave@syndicomm.com> # Dave Miller <justdave@syndicomm.com>
# Vaskin Kissoyan <vkissoyan@yahoo.com>
use diagnostics; use diagnostics;
use strict; use strict;
...@@ -83,7 +84,7 @@ sub show_bug { ...@@ -83,7 +84,7 @@ sub show_bug {
bug_file_loc, short_desc, target_milestone, bug_file_loc, short_desc, target_milestone,
qa_contact, status_whiteboard, qa_contact, status_whiteboard,
date_format(creation_ts,'%Y-%m-%d %H:%i'), date_format(creation_ts,'%Y-%m-%d %H:%i'),
groupset, delta_ts, sum(votes.count) groupset, delta_ts, sum(votes.count), delta_ts calc_disp_date
FROM bugs LEFT JOIN votes USING(bug_id), products, components FROM bugs LEFT JOIN votes USING(bug_id), products, components
WHERE bugs.bug_id = $id WHERE bugs.bug_id = $id
AND bugs.product_id = products.id AND bugs.product_id = products.id
...@@ -99,15 +100,25 @@ sub show_bug { ...@@ -99,15 +100,25 @@ sub show_bug {
} }
my $value; my $value;
my $disp_date;
my @row = FetchSQLData(); my @row = FetchSQLData();
foreach my $field ("bug_id", "alias", "product", "version", "rep_platform", foreach my $field ("bug_id", "alias", "product", "version", "rep_platform",
"op_sys", "bug_status", "resolution", "priority", "op_sys", "bug_status", "resolution", "priority",
"bug_severity", "component", "assigned_to", "reporter", "bug_severity", "component", "assigned_to", "reporter",
"bug_file_loc", "short_desc", "target_milestone", "bug_file_loc", "short_desc", "target_milestone",
"qa_contact", "status_whiteboard", "creation_ts", "qa_contact", "status_whiteboard", "creation_ts",
"groupset", "delta_ts", "votes") "groupset", "delta_ts", "votes","calc_disp_date")
{ {
$value = shift(@row); $value = shift(@row);
if ($field eq "calc_disp_date") {
# Convert MySQL timestamp (_ts) to datetime format(%Y-%m-%d %H:%i)
$disp_date = substr($value,0,4) . '-';
$disp_date .= substr($value,4,2) . '-';
$disp_date .= substr($value,6,2) . ' ';
$disp_date .= substr($value,8,2) . ':';
$disp_date .= substr($value,10,2);
$value = $disp_date;
}
$bug{$field} = defined($value) ? $value : ""; $bug{$field} = defined($value) ? $value : "";
} }
......
template/en/default/bug/edit.html.tmpl
View file @ f9e05e27
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
# Rights Reserved. # Rights Reserved.
# #
# Contributor(s): Gervase Markham <gerv@gerv.net> # Contributor(s): Gervase Markham <gerv@gerv.net>
# Vaskin Kissoyan <vkissoyan@yahoo.com>
#%] #%]
[% filtered_desc = bug.short_desc FILTER html %] [% filtered_desc = bug.short_desc FILTER html %]
...@@ -25,6 +26,7 @@ ...@@ -25,6 +26,7 @@
title = "Bug $bug.bug_id - $bug.short_desc" title = "Bug $bug.bug_id - $bug.short_desc"
h1 = "Bugzilla Bug $bug.bug_id" h1 = "Bugzilla Bug $bug.bug_id"
h2 = filtered_desc h2 = filtered_desc
h3 = "Last modified: $bug.calc_disp_date"
header_html = navigation_links header_html = navigation_links
%] %]
[% END %] [% END %]
......
template/en/default/global/header.html.tmpl
View file @ f9e05e27
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
# Rights Reserved. # Rights Reserved.
# #
# Contributor(s): Gervase Markham <gerv@gerv.net> # Contributor(s): Gervase Markham <gerv@gerv.net>
# Vaskin Kissoyan <vkissoyan@yahoo.com>
#%] #%]
[%# INTERFACE: [%# INTERFACE:
...@@ -24,6 +25,7 @@ ...@@ -24,6 +25,7 @@
# title: string. Page title. # title: string. Page title.
# h1: string. Main page header. # h1: string. Main page header.
# h2: string. Page subheader. # h2: string. Page subheader.
# h3: string. Right-aligned subheader.
# bgcolor: string. the page's background color ("#rrggbb"). # bgcolor: string. the page's background color ("#rrggbb").
# onload: string. JavaScript code to run when the page finishes loading. # onload: string. JavaScript code to run when the page finishes loading.
# header_html: string. Any other HTML to go inside the <head> tags. # header_html: string. Any other HTML to go inside the <head> tags.
...@@ -40,6 +42,7 @@ ...@@ -40,6 +42,7 @@
[% DEFAULT [% DEFAULT
h1 = title h1 = title
h2 = "" h2 = ""
h3 = ""
bgcolor = "#ffffff" bgcolor = "#ffffff"
onload = "" onload = ""
%] %]
...@@ -85,7 +88,7 @@ ...@@ -85,7 +88,7 @@
[% INCLUDE global/banner.html.tmpl %] [% INCLUDE global/banner.html.tmpl %]
[% IF h1 || h2 %] [% IF h1 || h2 %]
<table border="0" cellspacing="0"> <table border="0" cellspacing="0" width="100%">
<tr> <tr>
<td valign="top" align="left"> <td valign="top" align="left">
<table border="0" cellpadding="0" cellspacing="2"> <table border="0" cellpadding="0" cellspacing="2">
...@@ -96,8 +99,11 @@ ...@@ -96,8 +99,11 @@
</tr> </tr>
</table> </table>
</td> </td>
<td valign="middle">&nbsp;</td> <td valign="middle" align="left">&nbsp;</td>
<td valign="middle" align="left">[% h2 %]</td> <td valign="middle" align="left">[% h2 %]</td>
[% IF h3 %]
<td valign="middle" align="right">[% h3 %]</td>
[% END %]
</tr> </tr>
</table> </table>
[% END %] [% END %]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment