[Rt-commit] r18104 - in rt/3.999/branches/merge_to_3.8.2: . share/html/Ticket/Elements
sunnavy at bestpractical.com
sunnavy at bestpractical.com
Fri Jan 30 04:18:12 EST 2009
Author: sunnavy
Date: Fri Jan 30 04:18:11 2009
New Revision: 18104
Modified:
rt/3.999/branches/merge_to_3.8.2/ (props changed)
rt/3.999/branches/merge_to_3.8.2/share/html/Elements/MakeClicky
rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Elements/ShowGroupMembers
rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Elements/ShowHistory
rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Elements/ShowMessageStanza
rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Elements/ShowPeople
rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Elements/ShowTransaction
rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Elements/ShowTransactionAttachments
Log:
r19398 at sunnavys-mb: sunnavy | 2009-01-30 17:16:54 +0800
case fixes
Modified: rt/3.999/branches/merge_to_3.8.2/share/html/Elements/MakeClicky
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/Elements/MakeClicky (original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/Elements/MakeClicky Fri Jan 30 04:18:11 2009
@@ -130,7 +130,7 @@
<%INIT>
return unless defined $$content;
unless ( $regexp ) {
- RT::Interface::Web::EscapeUTF8( $content ) unless $html;
+ RT::Interface::Web::escape_utf8( $content ) unless $html;
return;
}
Modified: rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Elements/ShowGroupMembers
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Elements/ShowGroupMembers (original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Elements/ShowGroupMembers Fri Jan 30 04:18:11 2009
@@ -49,8 +49,8 @@
% my $Users = $group->user_members_obj( recursively => $recursively );
% while ( my $user = $Users->next ) {
-<& /Elements/ShowUser, user => $user, ticket => $Ticket &>
-<& /Elements/ShowUserEmailFrequency, user => $user, ticket => $Ticket &><br />
+<& /Elements/ShowUser, user => $user, ticket => $ticket &>
+<& /Elements/ShowUserEmailFrequency, user => $user, ticket => $ticket &><br />
% }
% my $Groups = $group->group_members_obj( recursively => $recursively );
% $Groups->limit_to_user_defined_groups;
Modified: rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Elements/ShowHistory
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Elements/ShowHistory (original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Elements/ShowHistory Fri Jan 30 04:18:11 2009
@@ -120,7 +120,7 @@
row_num => $i,
attachments => \@trans_attachments,
attachment_content => $trans_content,
- last_transaction => $IsLastTransactions,
+ last_transaction => $IsLastTransaction,
);
# manually flush the content buffer after each txn, so the user sees
Modified: rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Elements/ShowMessageStanza
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Elements/ShowMessageStanza (original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Elements/ShowMessageStanza Fri Jan 30 04:18:11 2009
@@ -46,16 +46,16 @@
%#
%# END BPS TAGGED BLOCK }}}
<%perl>
-if ( ref $Message ) {
- $m->out('<pre>') if $plain_text_pre && !$Depth;
- $m->out( qq{<div class="message-stanza-depth-$Depth">} );
+if ( ref $message ) {
+ $m->out('<pre>') if $plain_text_pre && !$depth;
+ $m->out( qq{<div class="message-stanza-depth-$depth">} );
my @stack;
my $para = '';
my $i = 0;
- AGAIN: foreach ( ; $i < @$Message; $i++ ) {
- my $stanza = $Message->[$i];
+ AGAIN: foreach ( ; $i < @$message; $i++ ) {
+ my $stanza = $message->[$i];
if ( ref $stanza eq "HASH" ) {
$para .= ( defined $stanza->{raw} ? $stanza->{raw} : '') ."\n";
}
@@ -63,26 +63,26 @@
$print_content->( \$para ); $para = '';
- $Depth++;
- push @stack, [$Message, $i+1];
- ($Message, $i) = ($stanza, -1);
- $m->out( qq{<div class="message-stanza-depth-$Depth">} );
+ $depth++;
+ push @stack, [$message, $i+1];
+ ($message, $i) = ($stanza, -1);
+ $m->out( qq{<div class="message-stanza-depth-$depth">} );
}
if ( length $para ) {
$print_content->( \$para ); $para = '';
}
if ( @stack ) {
- ($Message, $i) = @{ pop @stack };
- $Depth--;
+ ($message, $i) = @{ pop @stack };
+ $depth--;
$m->out('</div>');
goto AGAIN;
}
$m->out('</div>');
- $m->out('</pre>') if $plain_text_pre && !$Depth;
+ $m->out('</pre>') if $plain_text_pre && !$depth;
} else {
- $print_content->( \$Message );
+ $print_content->( \$message );
}
</%perl>
<%INIT>
Modified: rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Elements/ShowPeople
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Elements/ShowPeople (original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Elements/ShowPeople Fri Jan 30 04:18:11 2009
@@ -49,7 +49,7 @@
<tr>
<td class="label"><&|/l&>Owner</&>:</td>
<td class="value"><& /Elements/ShowUser, user => $ticket->owner_obj, ticket => $ticket &>
- <& /Elements/ShowUserEmailFrequency, User => $owner, Ticket => $Ticket &></td></td>
+ <& /Elements/ShowUserEmailFrequency, user => $ticket->owner_obj, ticket => $ticket &></td></td>
</tr>
<tr>
<td class="labeltop"><&|/l&>Requestors</&>:</td>
Modified: rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Elements/ShowTransaction
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Elements/ShowTransaction (original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Elements/ShowTransaction Fri Jan 30 04:18:11 2009
@@ -52,8 +52,7 @@
<div class="metadata">
<span class="type">
<a name="txn-<% $transaction->id %>" href="<% $display_path %>#txn-<% $transaction->id %>">#</a>
- <% $last_transaction ? '<a id="lasttrans" name="lasttrans"/>' : ''|n %>
- <% $LastTransaction ? '<a id="lasttrans" name="lasttrans"></a>' : ''|n %>
+ <% $last_transaction ? '<a id="lasttrans" name="lasttrans"></a>' : ''|n %>
</span>
<span class="date"><% $transdate|n %></span>
% my $desc = $transaction->brief_description;
@@ -61,7 +60,7 @@
<span class="description">
<% $transaction->creator_obj->name %> - <% $TicketString %> <% $desc %>
</span>
- <span class="time-taken"><% $TimeTaken %></span>
+ <span class="time-taken"><% $time_taken %></span>
<span class="actions<% $titlebar_commands ? '': ' hidden'%>"><% $titlebar_commands |n %></span>
</div>
Modified: rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Elements/ShowTransactionAttachments
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Elements/ShowTransactionAttachments (original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Elements/ShowTransactionAttachments Fri Jan 30 04:18:11 2009
@@ -67,7 +67,7 @@
</div>
% }
% # If there is sub-messages, open a dedicated div
-% if ( scalar ( grep $_->__value('Parent') == $message->id, @$Attachments ) ) {
+% if ( scalar ( grep $_->__value('Parent') == $message->id, @$attachments ) ) {
<div class="messageattachments">
% } else {
@@ -118,7 +118,7 @@
# if it's a text/html clean the body and show it
if ( $message->content_type =~ m{^text/(?:html|enriched)$}i ) {
$content = $m->comp( '/Elements/ScrubHTML', Content => $content );
- if ( $message->ContentType eq 'text/html' ) {
+ if ( $message->content_type eq 'text/html' ) {
$m->comp('/Elements/MakeClicky',
content => \$content, html => 1 );
}
More information about the Rt-commit
mailing list