[Rt-commit] r4606 - in rt/branches/3.7-EXPERIMENTAL: .

[jesse at bestpractical.com]

Author: jesse
Date: Wed Mar  1 00:07:47 2006
New Revision: 4606

Modified:
   rt/branches/3.7-EXPERIMENTAL/   (props changed)
   rt/branches/3.7-EXPERIMENTAL/html/Search/Elements/BuildFormatString

Log:
 r24796 at truegrounds:  jesse | 2006-02-28 01:11:17 -0500
 * Refactoring to deal with former braindamage in queue-based search


Modified: rt/branches/3.7-EXPERIMENTAL/html/Search/Elements/BuildFormatString
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Search/Elements/BuildFormatString	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Search/Elements/BuildFormatString	Wed Mar  1 00:07:47 2006
@@ -108,11 +108,16 @@
 
 my $CustomFields = RT::CustomFields->new( $session{'CurrentUser'});
 foreach my $id (keys %cfqueues) {
-    # What does this _do_? What are the keys to cfqueues
-    $id =~ s/^.'*(.*).'*$/$1/;
-    # Gotta load up the $queue object, since queues get stored by name now.
+    # Gotta load up the $queue object, since queues get stored by name now. my $id
     my $queue = RT::Queue->new($session{'CurrentUser'});
     $queue->Load($id);
+    unless ($queue->id) {
+        # XXX TODO: This ancient code dates from a former developer
+        # we have no idea what it means or why cfqueues are so encoded.
+        $id =~ s/^.'*(.*).'*$/$1/;
+        $queue->Load($id);
+    }
+    $queue->Load($id);
     $CustomFields->LimitToQueue($queue->Id);
 }
 $CustomFields->LimitToGlobal;