[Rt-commit] [svn] r1209 - in rt: . branches/rt-3.1/lib/RT branches/rt-3.3/etc/upgrade/3.1.0

[autrijus at pallas.eruditorum.org]

Author: autrijus
Date: Mon Jul 12 16:22:48 2004
New Revision: 1209

Modified:
   rt/   (props changed)
   rt/branches/rt-3.1/lib/RT/Ticket_Overlay.pm
   rt/branches/rt-3.3/etc/upgrade/3.1.0/schema.SQLite
Log:
 ----------------------------------------------------------------------
 r5990 at not:  autrijus | 2004-07-12T20:22:03.588615Z
 
 * Let the cf param in Ticket->CustomFieldValues be optional,
   so we can get Atom tests to work.
 ----------------------------------------------------------------------


Modified: rt/branches/rt-3.1/lib/RT/Ticket_Overlay.pm
==============================================================================
--- rt/branches/rt-3.1/lib/RT/Ticket_Overlay.pm	(original)
+++ rt/branches/rt-3.1/lib/RT/Ticket_Overlay.pm	Mon Jul 12 16:22:48 2004
@@ -3312,14 +3312,14 @@
 
     if ($field =~ /^\d+$/) {
         $cf->LoadById($field);
-    } else {
+    } elsif ($field) {
         $cf->LoadByNameAndQueue(Name => $field, Queue => $self->QueueObj->Id);
         unless( $cf->id ) {
             $cf->LoadByNameAndQueue(Name => $field, Queue => '0');
         }
     }
     my $cf_values = RT::TicketCustomFieldValues->new( $self->CurrentUser );
-    $cf_values->LimitToCustomField($cf->id);
+    $cf_values->LimitToCustomField($cf->id) if $cf->id;
     $cf_values->LimitToTicket($self->Id());
     $cf_values->OrderBy( FIELD => 'id' );
 

Modified: rt/branches/rt-3.3/etc/upgrade/3.1.0/schema.SQLite
==============================================================================
--- rt/branches/rt-3.3/etc/upgrade/3.1.0/schema.SQLite	(original)
+++ rt/branches/rt-3.3/etc/upgrade/3.1.0/schema.SQLite	Mon Jul 12 16:22:48 2004
@@ -13,7 +13,8 @@
   LastUpdated DATETIME NULL  
  
 ) ;
-CREATE INDEX Attributes1 on Attributes(Name)
+
+CREATE INDEX Attributes1 on Attributes(Name);
 CREATE INDEX Attributes2 on Attributes(ObjectType, ObjectId);
 
 --- }}}