OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 02-Apr-2003 17:41:47
Branch: HEAD Handle: 2003040216414600
Modified files:
openpkg-src/rt rt.patch
Log:
make stanzas appear as a single message
Summary:
Revision Changes Path
1.3 +32 -8 openpkg-src/rt/rt.patch
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/rt/rt.patch
============================================================================
$ cvs diff -u -r1.2 -r1.3 rt.patch
--- openpkg-src/rt/rt.patch 2 Apr 2003 14:20:00 -0000 1.2
+++ openpkg-src/rt/rt.patch 2 Apr 2003 15:41:46 -0000 1.3
@@ -10,16 +10,40 @@
return ($email);
}
--- html/Ticket/Elements/ShowMessageStanza.dist Wed Apr 2 15:28:24 2003
-+++ html/Ticket/Elements/ShowMessageStanza Wed Apr 2 15:28:44 2003
-@@ -32,10 +32,9 @@
- my $content = $stanza->{raw};
- RT::Interface::Web::EscapeUTF8(\$content);
- $m->comp('/Elements/Callback', content => \$content, %ARGS);
++++ html/Ticket/Elements/ShowMessageStanza Wed Apr 2 17:23:30 2003
+@@ -22,21 +22,22 @@
+ %#
+ %# END LICENSE BLOCK
+ <%perl>
+-foreach my $stanza (@$Message) {
+- if ( ref $stanza eq "ARRAY" ) {
+- $m->comp( 'ShowMessageStanza',
+- Depth => $Depth + 1,
+- Message => $stanza );
++ { my $msg = '';
++ foreach my $stanza (@$Message) {
++ if ( ref $stanza eq "ARRAY" ) {
++ $m->comp( 'ShowMessageStanza',
++ Depth => $Depth + 1,
++ Message => $stanza );
++ }
++ elsif ( ref $stanza eq "HASH" ) {
++ my $content = $stanza->{raw};
++ RT::Interface::Web::EscapeUTF8(\$content);
++ $m->comp('/Elements/Callback', content => \$content, %ARGS);
++ $msg .= "$content\n";
++ }
+ }
+- elsif ( ref $stanza eq "HASH" ) {
+- my $content = $stanza->{raw};
+- RT::Interface::Web::EscapeUTF8(\$content);
+- $m->comp('/Elements/Callback', content => \$content, %ARGS);
- $content =~ s/\n/<br>/gi;
-
+-
</%perl>
-<font color="<%$colors[$Depth]%>"><%$content |n%><br></font>
-+<font color="<%$colors[$Depth]%>"><pre><%$content |n%></pre><br></font>
- % }
+-% }
++<font color="<%$colors[$Depth]%>"><pre><%$msg |n%></pre><br></font>
% }
<%INIT>
+ use URI::URL;
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
