[Rt-commit] r7485 - in rt/branches/3.7-EXPERIMENTAL: . html/Ticket/Elements lib/RT

[jesse at bestpractical.com]

Author: jesse
Date: Wed Apr 11 20:27:40 2007
New Revision: 7485

Modified:
   rt/branches/3.7-EXPERIMENTAL/   (props changed)
   rt/branches/3.7-EXPERIMENTAL/html/Elements/SelectOwner
   rt/branches/3.7-EXPERIMENTAL/html/Elements/SelectStatus
   rt/branches/3.7-EXPERIMENTAL/html/Ticket/Elements/PreviewScrips
   rt/branches/3.7-EXPERIMENTAL/lib/RT/Record.pm

Log:
 r14051 at 108:  jesse | 2006-07-17 10:37:23 -0400
 
 r27961 at 108:  jesse | 2006-09-29 19:42:56 -0400
 * 3.7.1
 r27991 at 108:  jesse | 2006-10-02 08:17:23 -0400
 * UNIVERSAL::require is an RT dependency UNIVERSAL::require is an RT dependency UNIVERSAL::require is an RT dependency UNIVERSAL::require is an RT dependency 
 r54771 at 108:  jesse | 2007-04-11 20:24:36 -0400
 * Cleaning up code to cut down on warnings
 
 r54772 at 108:  jesse | 2007-04-11 20:27:10 -0400
 * Typo in the loc cleanup


Modified: rt/branches/3.7-EXPERIMENTAL/html/Elements/SelectOwner
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Elements/SelectOwner	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Elements/SelectOwner	Wed Apr 11 20:27:40 2007
@@ -48,7 +48,7 @@
 <option <% !$Default ? "SELECTED" : '' %> value=""><%$DefaultLabel%></option>
 %}
 %foreach my $User ( @users)  {
-<option <% ($User->Id == $Default) ? "SELECTED" : ''%>
+<option <% (defined $Default && $User->Id == $Default) ? "SELECTED" : ''%>
 %if ($ValueAttribute eq 'id') {
     value="<%$User->id%>"
 %} elsif ($ValueAttribute eq 'Name') {

Modified: rt/branches/3.7-EXPERIMENTAL/html/Elements/SelectStatus
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Elements/SelectStatus	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Elements/SelectStatus	Wed Apr 11 20:27:40 2007
@@ -49,7 +49,7 @@
 %}
 %foreach my $status (@status) {
 %next if ($SkipDeleted && $status eq 'deleted');
-<option <% ($status eq $Default) && "SELECTED" %> value="<%$status%>"><%loc($status)%></option>
+<option <% (defined $Default &&  $status eq $Default) && "SELECTED" %> value="<%$status%>"><%loc($status)%></option>
 % }
 </select>
 <%ONCE>

Modified: rt/branches/3.7-EXPERIMENTAL/html/Ticket/Elements/PreviewScrips
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Ticket/Elements/PreviewScrips	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Ticket/Elements/PreviewScrips	Wed Apr 11 20:27:40 2007
@@ -67,7 +67,7 @@
 
 my $action;
 
-if (( $ARGS{'UpdateType'} eq 'response' ) || ($ARGS{'Action'} eq 'Respond' )) {
+if (($ARGS{'UpdateType'} &&  $ARGS{'UpdateType'} eq 'response' ) || ($ARGS{'Action'} && $ARGS{'Action'} eq 'Respond' )) {
     $action = 'Correspond';
 }
 else {
@@ -100,7 +100,7 @@
 
 % foreach my $scrip (@{$Object->Scrips->Prepared}) {
 % next unless $scrip->ActionObj->Action->isa('RT::Action::SendEmail');
-<b><% $scrip->Description %></b><br />
+<b><% $scrip->Description || loc('Scrip #[_1]',$scrip->id) %></b><br />
 <&|/l, loc($scrip->ConditionObj->Name), loc($scrip->ActionObj->Name), loc($scrip->TemplateObj->Name)&>[_1] [_2] with template [_3]</&>
 <br />
 %foreach my $type qw(To Cc Bcc) {

Modified: rt/branches/3.7-EXPERIMENTAL/lib/RT/Record.pm
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/lib/RT/Record.pm	(original)
+++ rt/branches/3.7-EXPERIMENTAL/lib/RT/Record.pm	Wed Apr 11 20:27:40 2007
@@ -822,7 +822,7 @@
 sub _DecodeLOB {
     my $self            = shift;
     my $ContentType     = shift;
-    my $ContentEncoding = shift;
+    my $ContentEncoding = shift || 'none';
     my $Content         = shift;
 
     if ( $ContentEncoding eq 'base64' ) {