Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 675502 - show_bug.cgi ctype=xml should include some more comment information

Browse Source 
r=dkl, a=LpSolit


git-svn-id: svn://10.0.0.236/trunk@263726 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mkanat%bugzilla.org 2012-04-20 18:01:10 +00:00
parent c1c1b703c5
commit aaa0c224dd
3 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/webtools/bugzilla/.bzrrev
View File

@ -1 +1 @@
8209
8210

34
mozilla/webtools/bugzilla/template/en/default/bug/show.xml.tmpl
View File

@ -53,20 +53,11 @@
[% PROCESS section_flags obj => bug %]
[% IF displayfields.long_desc %]
[% sort_order = user.settings.comment_sort_order.value %]
<comment_sort_order>[% sort_order FILTER xml %]</comment_sort_order>
[% FOREACH c = bug.comments %]
[% NEXT IF c.is_private && !user.is_insider %]
<long_desc isprivate="[% c.is_private FILTER xml %]">
<commentid>[% c.id FILTER xml %]</commentid>
[% IF c.is_about_attachment %]
<attachid>[% c.extra_data FILTER xml %]</attachid>
[% END %]
<who name="[% c.author.name FILTER xml %]">[% c.author.email FILTER email FILTER xml %]</who>
<bug_when>[% c.creation_ts FILTER time("%Y-%m-%d %T %z") FILTER xml %]</bug_when>
[% IF user.is_timetracker && (c.work_time - 0 != 0) %]
<work_time>[% PROCESS formattimeunit time_unit = c.work_time FILTER xml %]</work_time>
[% END %]
<thetext>[% c.body_full FILTER xml %]</thetext>
</long_desc>
[% PROCESS a_comment %]
[% END %]
[% END %]
@ -150,3 +141,20 @@
/>
[% END %]
[% END %]
[% BLOCK a_comment %]
[% RETURN IF c.is_private && !user.is_insider %]
<long_desc isprivate="[% c.is_private FILTER xml %]" >
<commentid>[% c.id FILTER xml %]</commentid>
<comment_count>[% c.count FILTER xml %]</comment_count>
[% IF c.is_about_attachment %]
<attachid>[% c.extra_data FILTER xml %]</attachid>
[% END %]
<who name="[% c.author.name FILTER xml %]">[% c.author.email FILTER email FILTER xml %]</who>
<bug_when>[% c.creation_ts FILTER time("%Y-%m-%d %T %z") FILTER xml %]</bug_when>
[% IF user.is_timetracker && (c.work_time - 0 != 0) %]
<work_time>[% PROCESS formattimeunit time_unit = c.work_time FILTER xml %]</work_time>
[% END %]
<thetext>[% c.body_full FILTER xml %]</thetext>
</long_desc>
[% END %]

5
mozilla/webtools/bugzilla/template/en/default/pages/bugzilla.dtd.tmpl
View File

@ -56,6 +56,7 @@
token?,
group*,
flag*,
comment_sort_order*,
long_desc*,
attachment*)?)>
<!ATTLIST [% "bug" %]
@ -116,11 +117,13 @@
[% FOREACH field = Bugzilla.active_custom_fields %]
<!ELEMENT [% field.name FILTER xml %] (#PCDATA)>
[% END %]
<!ELEMENT long_desc (commentid, attachid?, who, bug_when, work_time?, thetext)>
<!ELEMENT comment_sort_order (#PCDATA)>
<!ELEMENT long_desc (commentid, comment_count, attachid?, who, bug_when, work_time?, thetext)>
<!ATTLIST long_desc
isprivate (0|1) #REQUIRED
>
<!ELEMENT commentid (#PCDATA)>
<!ELEMENT comment_count (#PCDATA)>
<!ELEMENT who (#PCDATA)>
<!ATTLIST who
name CDATA #REQUIRED