[Rt-commit] r18211 - in rt/3.999/branches/lorzy: lib/RT lib/RT/Model share/html/Ticket/Elements

[clkao at bestpractical.com]

Author: clkao
Date: Wed Feb  4 18:36:54 2009
New Revision: 18211

Modified:
   rt/3.999/branches/lorzy/   (props changed)
   rt/3.999/branches/lorzy/lib/RT/Model/Attachment.pm
   rt/3.999/branches/lorzy/lib/RT/Model/Transaction.pm
   rt/3.999/branches/lorzy/lib/RT/ScripAction.pm
   rt/3.999/branches/lorzy/share/html/Ticket/Elements/ShowTransaction
   rt/3.999/branches/lorzy/share/html/Ticket/Elements/ShowTransactionAttachments

Log:
merge branch merge_to_3.8.2 to lorzy.

Modified: rt/3.999/branches/lorzy/lib/RT/Model/Attachment.pm
==============================================================================
--- rt/3.999/branches/lorzy/lib/RT/Model/Attachment.pm	(original)
+++ rt/3.999/branches/lorzy/lib/RT/Model/Attachment.pm	Wed Feb  4 18:36:54 2009
@@ -88,10 +88,18 @@
         content_type => max_length is 200,
         type is 'varchar(200)', default is '';
     column filename => max_length is 255, type is 'varchar(255)', default is '';
-    column subject  => max_length is 255, type is 'varchar(255)', default is '';
-    column content  => type is 'blob',    default is '';
+    column
+      subject => max_length is 255,
+      type is 'varchar(255)', default is '',
+      filters are 'Jifty::DBI::Filter::utf8';
+    column
+      content => type is 'blob',
+      default is '';
     column content_encoding => type is 'blob', default is '';
-    column headers          => type is 'blob', default is '';
+    column
+      headers => type is 'blob',
+      default is '',
+      filters are 'Jifty::DBI::Filter::utf8';
 
 };
 use Jifty::Plugin::ActorMetadata::Mixin::Model::ActorMetadata map => {
@@ -132,7 +140,7 @@
     $Attachment->make_singlepart;
 
     # Get the subject
-    my $subject = $Attachment->head->get( 'subject', 0 );
+    my $subject = $Attachment->head->get( 'Subject', 0 );
     defined($subject) or $subject = '';
     chomp($subject);
 

Modified: rt/3.999/branches/lorzy/lib/RT/Model/Transaction.pm
==============================================================================
--- rt/3.999/branches/lorzy/lib/RT/Model/Transaction.pm	(original)
+++ rt/3.999/branches/lorzy/lib/RT/Model/Transaction.pm	Wed Feb  4 18:36:54 2009
@@ -78,9 +78,11 @@
     column field      => max_length is 40, type is 'varchar(40)';
     column
         old_value => max_length is 255,
+        filters are 'Jifty::DBI::Filter::utf8',
         type is 'varchar(255)';
     column
         new_value => max_length is 255,
+        filters are 'Jifty::DBI::Filter::utf8',
         type is 'varchar(255)';
     column
         reference_type => max_length is 255,

Modified: rt/3.999/branches/lorzy/lib/RT/ScripAction.pm
==============================================================================
--- rt/3.999/branches/lorzy/lib/RT/ScripAction.pm	(original)
+++ rt/3.999/branches/lorzy/lib/RT/ScripAction.pm	Wed Feb  4 18:36:54 2009
@@ -196,14 +196,9 @@
     # oddly circular
     $self->{'scrip_action_obj'} = undef;
     $self->{'scrip_obj'}       = undef;
-    $self->{'template_obj'}    = undef $self->{'ticket_obj'} = undef;
+    $self->{'template_obj'}    = undef;
+    $self->{'ticket_obj'} = undef;
     $self->{'transaction_obj'} = undef;
 }
 
-
-eval "require RT::ScripAction_Vendor";
-die $@ if ( $@ && $@ !~ qr{^Can't locate RT/Action_Vendor.pm} );
-eval "require RT::ScripAction_Local";
-die $@ if ( $@ && $@ !~ qr{^Can't locate RT/Action_Local.pm} );
-
 1;

Modified: rt/3.999/branches/lorzy/share/html/Ticket/Elements/ShowTransaction
==============================================================================
--- rt/3.999/branches/lorzy/share/html/Ticket/Elements/ShowTransaction	(original)
+++ rt/3.999/branches/lorzy/share/html/Ticket/Elements/ShowTransaction	Wed Feb  4 18:36:54 2009
@@ -46,9 +46,9 @@
 %# 
 %# END BPS TAGGED BLOCK }}}
 <div class="ticket-transaction <% $type_class %> <% $row_num % 2 ? 'odd' : 'even' %>">
-% $m->callback( titlebar_cmd => \$titlebar_commands, Transaction => $transaction, %ARGS, callback_name => 'ModifyDisplay' );
+% $m->callback( titlebar_cmd => \$titlebar_commands, transaction => $transaction, %ARGS, callback_name => 'ModifyDisplay' );
 <div class="ticket-transaction">
-% $m->callback( titlebar_cmd => \$titlebar_commands, Transaction => $transaction, %ARGS, callback_name => 'ModifyCommand' );
+% $m->callback( titlebar_cmd => \$titlebar_commands, transaction => $transaction, %ARGS, callback_name => 'ModifyCommand' );
   <div class="metadata">
     <span class="type">
       <a name="txn-<% $transaction->id %>" href="<% $display_path %>#txn-<% $transaction->id %>">#</a>
@@ -56,7 +56,7 @@
     </span>
     <span class="date"><% $transdate|n %></span>
 % my $desc = $transaction->brief_description;
-% $m->callback( text => \$desc, Transaction => $transaction, %ARGS, callback_name => 'ModifyDisplay' );
+% $m->callback( text => \$desc, transaction => $transaction, %ARGS, callback_name => 'ModifyDisplay' );
     <span class="description">
       <% $transaction->creator_obj->name %> - <% $TicketString %> <% $desc %>
     </span>

Modified: rt/3.999/branches/lorzy/share/html/Ticket/Elements/ShowTransactionAttachments
==============================================================================
--- rt/3.999/branches/lorzy/share/html/Ticket/Elements/ShowTransactionAttachments	(original)
+++ rt/3.999/branches/lorzy/share/html/Ticket/Elements/ShowTransactionAttachments	Wed Feb  4 18:36:54 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 {