[Rt-commit] r4218 - in rt/branches/3.5-TESTING: . html/Elements lib/RT

[jesse at bestpractical.com]

Author: jesse
Date: Fri Dec  2 17:41:33 2005
New Revision: 4218

Modified:
   rt/branches/3.5-TESTING/   (props changed)
   rt/branches/3.5-TESTING/html/Elements/EditCustomFieldSelect
   rt/branches/3.5-TESTING/lib/RT/Tickets_Overlay.pm
Log:
 r19690 at truegrounds:  jesse | 2005-12-02 17:39:24 -0500
 * Merge fixups


Modified: rt/branches/3.5-TESTING/html/Elements/EditCustomFieldSelect
==============================================================================
--- rt/branches/3.5-TESTING/html/Elements/EditCustomFieldSelect	(original)
+++ rt/branches/3.5-TESTING/html/Elements/EditCustomFieldSelect	Fri Dec  2 17:41:33 2005
@@ -110,7 +110,7 @@
             <% $Values->HasEntry($value->Name) && ($$SelectedRef = 1) && 'SELECTED' %>
 % } elsif ($Default) {
             <% (ref $Default ? (grep {$_ eq $value->Name} @{$Default}) : ($Default eq $value->Name))
-                && ($$selectedRef = 1) && 'SELECTED' %>
+                && ($$SelectedRef = 1) && 'SELECTED' %>
 % }
             ><% $value->Name%></option>
 % }

Modified: rt/branches/3.5-TESTING/lib/RT/Tickets_Overlay.pm
==============================================================================
--- rt/branches/3.5-TESTING/lib/RT/Tickets_Overlay.pm	(original)
+++ rt/branches/3.5-TESTING/lib/RT/Tickets_Overlay.pm	Fri Dec  2 17:41:33 2005
@@ -1206,7 +1206,7 @@
   my ($self, $cfkey, $cfid, $field) = @_;
  
   my $TicketCFs;
-
+  my $CFs;
     # Perform one Join per CustomField
 
     if ( $self->{_sql_object_cf_alias}{$cfkey} ) {
@@ -1273,7 +1273,7 @@
         );
     }
 
-  return $TicketCFs;
+  return ($TicketCFs, $CFs);
 }
 
 =head2 _CustomFieldLimit
@@ -1306,9 +1306,18 @@
     }
 
     my $cfkey = $cfid ? $cfid : "$queue.$field";
-    my $TicketCFs = $self->_CustomFieldJoin( $cfkey, $cfid, $field );
+    my ($TicketCFs, $CFs) = $self->_CustomFieldJoin( $cfkey, $cfid, $field );
+
+     $self->_OpenParen;
+
+     $self->SUPER::Limit(
+         ALIAS           => $CFs,
+         FIELD           => 'name',
+         VALUE           => $field,
+         ENTRYAGGREGATOR => 'AND',
+     );
 
-     $self->_OpenParen if ($null_columns_ok);
+     $self->_OpenParen if $null_columns_ok;
 
     $self->_SQLLimit(
         ALIAS      => $TicketCFs,
@@ -1370,7 +1379,7 @@
        } elsif ( $meta->[0] eq 'CUSTOMFIELD' ) {
            my ($queue, $field, $cfid ) = $self->_CustomFieldDecipher( $subkey );
            my $cfkey = $cfid ? $cfid : "$queue.$field";
-           my $TicketCFs = $self->_CustomFieldJoin( $cfkey, $cfid, $field );
+           my ($TicketCFs, $CFs) = $self->_CustomFieldJoin( $cfkey, $cfid, $field );
            unless ($cfid) {
              # For those cases where we are doing a join against the
              # CF name, and don't have a CFid, use Unique to make sure