diff options
-rwxr-xr-x | Bugzilla/Bug.pm | 2 | ||||
-rw-r--r-- | bugzilla.dtd | 6 | ||||
-rw-r--r-- | template/en/default/bug/show.xml.tmpl | 5 |
3 files changed, 10 insertions, 3 deletions
diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm index 84f6ebd4b..8be6705ef 100755 --- a/Bugzilla/Bug.pm +++ b/Bugzilla/Bug.pm @@ -289,7 +289,7 @@ sub fields { reporter_accessible cclist_accessible classification_id classification product component version rep_platform op_sys - bug_status resolution + bug_status resolution dup_id bug_file_loc status_whiteboard keywords priority bug_severity target_milestone dependson blocked votes diff --git a/bugzilla.dtd b/bugzilla.dtd index 25a0a895b..5cdfc0c51 100644 --- a/bugzilla.dtd +++ b/bugzilla.dtd @@ -5,7 +5,7 @@ maintainer CDATA #REQUIRED exporter CDATA #IMPLIED > -<!ELEMENT bug (bug_id, (alias?, creation_ts, short_desc, delta_ts, reporter_accessible, cclist_accessible, classification_id, classification, product, component, version, rep_platform, op_sys, bug_status, resolution?, bug_file_loc?, status_whiteboard?, keywords*, priority, bug_severity, target_milestone?, dependson*, blocked*, votes?, everconfirmed, reporter, assigned_to, qa_contact?, cc*, (estimated_time, remaining_time, actual_time, deadline)?, group*, flag*, long_desc*, attachment*)?)> +<!ELEMENT bug (bug_id, (alias?, creation_ts, short_desc, delta_ts, reporter_accessible, cclist_accessible, classification_id, classification, product, component, version, rep_platform, op_sys, bug_status, resolution?, dup_id?, bug_file_loc?, status_whiteboard?, keywords*, priority, bug_severity, target_milestone?, dependson*, blocked*, votes?, everconfirmed, reporter, assigned_to, qa_contact?, cc*, (estimated_time, remaining_time, actual_time, deadline)?, group*, flag*, long_desc*, attachment*)?)> <!ATTLIST bug error (NotFound | NotPermitted | InvalidBugId) #IMPLIED > @@ -33,6 +33,7 @@ <!ELEMENT status_whiteboard (#PCDATA)> <!ELEMENT op_sys (#PCDATA)> <!ELEMENT resolution (#PCDATA)> +<!ELEMENT dup_id (#PCDATA)> <!ELEMENT bug_file_loc (#PCDATA)> <!ELEMENT short_desc (#PCDATA)> <!ELEMENT keywords (#PCDATA)> @@ -46,13 +47,14 @@ <!ELEMENT remaining_time (#PCDATA)> <!ELEMENT actual_time (#PCDATA)> <!ELEMENT deadline (#PCDATA)> -<!ELEMENT long_desc (who, bug_when, thetext)> +<!ELEMENT long_desc (who, bug_when, work_time?, thetext)> <!ATTLIST long_desc encoding (base64) #IMPLIED isprivate (0|1) #IMPLIED > <!ELEMENT who (#PCDATA)> <!ELEMENT bug_when (#PCDATA)> +<!ELEMENT work_time (#PCDATA)> <!ELEMENT thetext (#PCDATA)> <!ELEMENT attachment (attachid, date, desc, filename?, type?, data?, flag*)> <!ATTLIST attachment diff --git a/template/en/default/bug/show.xml.tmpl b/template/en/default/bug/show.xml.tmpl index 27fa175da..1e35d8f36 100644 --- a/template/en/default/bug/show.xml.tmpl +++ b/template/en/default/bug/show.xml.tmpl @@ -17,8 +17,10 @@ # Rights Reserved. # # Contributor(s): Bradley Baetz <bbaetz@student.usyd.edu.au> + # Colin Ogilvie <mozilla@colinogilvie.co.uk> # #%] +[% PROCESS bug/time.html.tmpl %] <?xml version="1.0" [% IF Param('utf8') %]encoding="UTF-8" [% END %]standalone="yes" ?> <!DOCTYPE bugzilla SYSTEM "[% Param('urlbase') %]bugzilla.dtd"> @@ -69,6 +71,9 @@ <long_desc isprivate="[% c.isprivate FILTER xml %]"> <who>[% c.email FILTER xml %]</who> <bug_when>[% c.time FILTER time FILTER xml %]</bug_when> + [% IF UserInGroup(Param('timetrackinggroup')) && (c.work_time - 0 != 0) %] + <work_time>[% PROCESS formattimeunit time_unit = c.work_time FILTER xml %]</work_time> + [% END %] <thetext>[% c.body FILTER xml %]</thetext> </long_desc> [% END %] |