[Rt-commit] r2179 - in rt/branches/PLATANO-EXPERIMENTAL-CSS: . lib/RT

[jesse at bestpractical.com]

Author: jesse
Date: Wed Feb  2 11:25:46 2005
New Revision: 2179

Modified:
   rt/branches/PLATANO-EXPERIMENTAL-CSS/   (props changed)
   rt/branches/PLATANO-EXPERIMENTAL-CSS/lib/RT/Tickets_Overlay.pm
Log:
 r4016 at hualien:  jesse | 2005-02-02T15:40:36.888212Z
  r3907 at hualien:  jesse | 2005-01-22T14:48:14.100308Z
  TicketSQL search fixes, especially to Custom field operations
  
 


Modified: rt/branches/PLATANO-EXPERIMENTAL-CSS/lib/RT/Tickets_Overlay.pm
==============================================================================
--- rt/branches/PLATANO-EXPERIMENTAL-CSS/lib/RT/Tickets_Overlay.pm	(original)
+++ rt/branches/PLATANO-EXPERIMENTAL-CSS/lib/RT/Tickets_Overlay.pm	Wed Feb  2 11:25:46 2005
@@ -577,7 +577,7 @@
         FIELD2 => 'ObjectId'
     );
 
-    $sb->Limit(
+    $sb->SUPER::Limit(
         ALIAS => $sb->{_sql_transalias},
         FIELD => 'ObjectType',
         VALUE => 'RT::Ticket'
@@ -667,7 +667,7 @@
         FIELD2 => 'ObjectId'
     );
 
-    $self->Limit(
+    $self->SUPER::Limit(
         ALIAS           => $self->{_sql_transalias},
         FIELD           => 'ObjectType',
         VALUE           => 'RT::Ticket',
@@ -785,7 +785,7 @@
       $self->NewAlias('Users');
 
 # Use regular joins instead of SQL joins since we don't want the joins inside ticketsql or we get a huge cartesian product
-    $self->Limit(
+    $self->SUPER::Limit(
         ALIAS           => $groups,
         FIELD           => 'Domain',
         VALUE           => 'RT::Ticket-Role',
@@ -1079,6 +1079,7 @@
     }
     $field = $1 if $field =~ /^{(.+)}$/;    # trim { }
 
+
 # If we're trying to find custom fields that don't match something, we want tickets
 # where the custom field has no value at all
 
@@ -1120,8 +1121,7 @@
             TABLE2 => 'ObjectCustomFieldValues',
             FIELD2 => 'ObjectId'
         );
-
-        $self->Limit(
+        $self->SUPER::Limit(
             LEFTJOIN => $TicketCFs,
             FIELD    => 'ObjectType',
             VALUE    => ref( $self->NewItem )
@@ -1130,7 +1130,7 @@
         );
 
         if ($cfid) {
-            $self->Limit(
+            $self->SUPER::Limit(
                 LEFTJOIN        => $TicketCFs,
                 FIELD           => 'CustomField',
                 VALUE           => $cfid,
@@ -1144,7 +1144,7 @@
                 TABLE2 => 'CustomFields',
                 FIELD2 => 'id'
             );
-            $self->Limit(
+            $self->SUPER::Limit(
                 LEFTJOIN => $cfalias,
                 FIELD    => 'Name',
                 VALUE    => $field,
@@ -1175,6 +1175,8 @@
     }
     $self->_CloseParen if ($null_columns_ok);
 
+
+
 }
 
 # End Helper Functions
@@ -2500,7 +2502,7 @@
     delete $self->{'rows'};
     delete $self->{'count_all'};
 
-    my $sql = $self->{_sql_query};    # Violating the _SQL namespace
+    my $sql = $self->Query;    # Violating the _SQL namespace
     if ( !$sql || $self->{'RecalcTicketLimits'} ) {
 
         #  "Restrictions to Clauses Branch\n";