[Rt-commit] r5260 - in rt/branches/CHALDEA-EXPERIMENTAL: . etc etc/upgrade/QUEBEC html/Elements html/NoAuth html/Search html/Ticket html/Ticket/Elements lib/RT lib/RT/Interface sbin

ruz at bestpractical.com ruz at bestpractical.com
Fri May 19 08:20:55 EDT 2006


Author: ruz
Date: Thu May 18 22:37:34 2006
New Revision: 5260

Modified:
   rt/branches/CHALDEA-EXPERIMENTAL/   (props changed)
   rt/branches/CHALDEA-EXPERIMENTAL/etc/RT_Config.pm.in
   rt/branches/CHALDEA-EXPERIMENTAL/etc/initialdata
   rt/branches/CHALDEA-EXPERIMENTAL/etc/upgrade/QUEBEC/content
   rt/branches/CHALDEA-EXPERIMENTAL/html/Elements/EditCustomFieldSelect
   rt/branches/CHALDEA-EXPERIMENTAL/html/NoAuth/webrt.css
   rt/branches/CHALDEA-EXPERIMENTAL/html/Search/Bulk.html
   rt/branches/CHALDEA-EXPERIMENTAL/html/Search/Results.tsv
   rt/branches/CHALDEA-EXPERIMENTAL/html/Ticket/Create.html
   rt/branches/CHALDEA-EXPERIMENTAL/html/Ticket/Elements/Tabs
   rt/branches/CHALDEA-EXPERIMENTAL/html/Ticket/Update.html
   rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/Interface/Web.pm
   rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/ObjectCustomFieldValue_Overlay.pm
   rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/SearchBuilder.pm
   rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/Ticket_Overlay.pm
   rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/Tickets_Overlay.pm
   rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/Transaction_Overlay.pm
   rt/branches/CHALDEA-EXPERIMENTAL/lib/t/regression/03web_compiliation_errors.t
   rt/branches/CHALDEA-EXPERIMENTAL/sbin/rt-test-dependencies.in

Log:
QUEBEC->CHALDEA

 r1950 at cubic-pc (orig r4560):  jesse | 2006-02-21 22:14:19 +0300
  r24472 at truegrounds:  jesse | 2006-02-21 13:57:01 -0500
   r22894 at truegrounds:  jesse | 2006-01-24 07:44:05 -0500
   * Note that our SQLite dependency is 1.0
   r22958 at truegrounds:  jesse | 2006-01-25 07:08:34 -0500
   From: Joop van de Wege <JoopvandeWege at mococo.nl>
   Message-Id: <20060125125248.1A97.JOOPVANDEWEGE at mococo.nl>
   
   > There is atleast one problem that I have spotted and that is that
   > schema.Oracle contains two empty lines in CREATE TABLE
   > ObjectCustomFieldValues which don't belong there.
   > That is the second set of errors you get. The first is an indication
   > that an sequence with that name already exists in the schema of that
   > Oracle users you're RT installing in.
   
   r22960 at truegrounds:  jesse | 2006-01-25 07:47:07 -0500
   * a couple added lines of docs to the cli
   r22962 at truegrounds:  jesse | 2006-01-25 08:18:09 -0500
   * Updated mandatory fields for ticket creation forms
   r24471 at truegrounds:  jesse | 2006-02-21 13:51:18 -0500
    r23026 at truegrounds (orig r4448):  kevinr | 2006-01-30 19:25:47 -0500
     r10537 at SAD-GIRL-IN-SNOW:  kevinr | 2006-01-30 19:20:52 -0500
     RT-Ticket: 7289
     RT-Status: resolved
     RT-Update: correspond
     
     Updated German translation (thanks to Thorsten Brumm)
    
    r23132 at truegrounds (orig r4497):  alexmv | 2006-02-04 18:34:45 -0500
     r8936 at zoq-fot-pik:  chmrr | 2006-02-04 18:24:38 -0500
      * Only rmtree if we have something to rm; keeps rmtree from
     complaining about 'Not root path(s) specified'
    
    r23133 at truegrounds (orig r4498):  alexmv | 2006-02-04 18:34:51 -0500
     r8937 at zoq-fot-pik:  chmrr | 2006-02-04 18:33:57 -0500
     RT-Ticket: 7329
     RT-Status: resolved
     RT-Update: correspond
     
      * Use SelectNewTicketQueue instead of SelectQueue
     
    
   
  
 
 r2172 at cubic-pc (orig r4721):  alexmv | 2006-03-10 00:53:17 +0300
  r8469 at zoq-fot-pik:  chmrr | 2006-03-09 16:52:49 -0500
   * Include Cc and AdminCc in CSV download
 
 r2173 at cubic-pc (orig r4722):  alexmv | 2006-03-10 02:13:22 +0300
  r8473 at zoq-fot-pik:  chmrr | 2006-03-09 18:13:13 -0500
   * Backport from 3.7 for CustomFields fixes
 
 r2325 at cubic-pc (orig r4931):  alexmv | 2006-04-01 02:51:38 +0400
  r12069 at zoq-fot-pik:  chmrr | 2006-03-31 17:50:29 -0500
   * Bump SearchBuilder dependency
 
 r2907 at cubic-pc (orig r4931):  svm | 2006-05-19 06:11:25 +0400
 SVM: initializing mirror for /mirrors/branches/QUEBEC-EXPERIMENTAL
 r3097 at cubic-pc (orig r5259):  ruz | 2006-05-19 06:18:42 +0400
 merge from 3.4
 
  r2079 at cubic-pc (orig r4686):  jesse | 2006-03-05 01:47:46 +0300
   r22962 at truegrounds:  jesse | 2006-01-25 05:18:09 -0800
   * Updated mandatory fields for ticket creation forms
  
  r2190 at cubic-pc (orig r4799):  jesse | 2006-03-23 09:37:59 +0300
   r30313 at truegrounds:  jesse | 2006-03-23 01:36:27 -0500
   * Better mp2 bulletproofing
  
  r2191 at cubic-pc (orig r4814):  jesse | 2006-03-24 06:40:37 +0300
   r10436 at hualien:  jesse | 2006-03-23 22:40:25 -0500
   * It helps when there aren't typos
  
  r2262 at cubic-pc (orig r4847):  alexmv | 2006-03-29 00:50:07 +0400
   r11918 at zoq-fot-pik:  chmrr | 2006-03-28 15:49:56 -0500
    * Backport TXN fixes from 3.7 and 3.5
  
  r2321 at cubic-pc (orig r4924):  jesse | 2006-03-31 06:07:23 +0400
   r10636 at hualien:  jesse | 2006-03-31 11:06:57 +0900
   RT-Ticket: 7398
   RT-Status: resolved
   RT-Update: correspond
   
   * Added a "RH" RedHat layout option to config.layout  -- Paulo Matos
  
  r2396 at cubic-pc (orig r5047):  ruz | 2006-04-18 04:40:06 +0400
  * check and report error to the logs
  r2421 at cubic-pc (orig r5060):  jesse | 2006-04-24 18:49:40 +0400
   r11842 at hualien:  jesse | 2006-04-24 10:49:13 -0400
   The following patch adds the useful LastUpdated field to the fields
   returned through the REST interface.
   David - who starts to wonder if his patches are actually read by someone :-)
   --
   David Schweikert        | phone: +41 44 632 7019
   System manager ISG.EE   | walk:  ETH Zentrum, ETL F24.1
   ETH Zurich, Switzerland | web:   http://people.ee.ethz.ch/dws
   
  
  r2422 at cubic-pc (orig r5064):  ruz | 2006-04-25 00:42:43 +0400
  * max subject is 200 character long
  r2423 at cubic-pc (orig r5065):  ruz | 2006-04-25 01:25:15 +0400
  * convert only if $enc'oding contains something
  r2424 at cubic-pc (orig r5066):  ruz | 2006-04-25 04:21:32 +0400
  * simple tests for Attachments manipulation from web interface
  r2548 at cubic-pc (orig r5115):  ruz | 2006-04-26 03:24:45 +0400
  * (cond) && 'selected' outputs 0 if condition fails on my system 
  r2549 at cubic-pc (orig r5116):  ruz | 2006-04-26 03:35:09 +0400
  * get queue ID from page
  r2658 at cubic-pc (orig r5118):  jesse | 2006-04-26 06:43:31 +0400
   r11882 at hualien:  jesse | 2006-04-25 22:43:11 -0400
   * Mark Eichin picked up that http://lists.fsck.com/pipermail/rt-devel/2004-August/006216.html had never been applied. 
   
   rt ls -l broke because of it, if your RT server wasn't at / 
  
  r2862 at cubic-pc (orig r5183):  jesse | 2006-05-09 06:31:56 +0400
   r13313 at hualien:  jesse | 2006-05-08 12:01:55 -0400
    * Finding disabled groups should actually find them, now
  
  r2863 at cubic-pc (orig r5184):  jesse | 2006-05-09 06:32:10 +0400
   r13314 at hualien:  jesse | 2006-05-08 12:14:26 -0400
   * Minor reformatting
  
  r2864 at cubic-pc (orig r5185):  jesse | 2006-05-09 06:32:19 +0400
   r13315 at hualien:  jesse | 2006-05-08 22:31:30 -0400
   * Mail gateway refactoring to make added functioanlity a bit easier. 
     No (intentional) functional changes.
  
  r2865 at cubic-pc (orig r5186):  jesse | 2006-05-09 06:56:20 +0400
   r13330 at hualien:  jesse | 2006-05-08 22:55:56 -0400
    * Reed Loden caught a perltidy error that, somewhat terrifiyingly, was still a valid mason page
  
  r2866 at cubic-pc (orig r5187):  jesse | 2006-05-09 08:48:10 +0400
   r13332 at hualien:  jesse | 2006-05-09 00:47:49 -0400
   * Mismatched parens
  
  r2867 at cubic-pc (orig r5206):  ruz | 2006-05-12 00:48:53 +0400
  * return values checking and more logging on errors
  r2868 at cubic-pc (orig r5207):  ruz | 2006-05-12 00:56:24 +0400
  * more checks on attachments processing
  r2869 at cubic-pc (orig r5208):  ruz | 2006-05-12 02:24:17 +0400
  * if ( not $xxx || $xxx->foo ) is equivalent to
    if ( not ( $xxx || $xxx->foo ) ) due to perl5 rules
    which is not expected behaviour
  r2870 at cubic-pc (orig r5209):  ruz | 2006-05-12 02:31:58 +0400
  * user do next steps:
      1) open ticket #1
      2) click reply
      3) upload attachment
      4) open ticket #2 in another browser window
      5) send reply to the ticket #1
    RT looses uploaded attachment due to step 4) as RT tries
    to add attchement to the ticket #2 and drops them from session.
    As solution don't ProcessTicketMessage if there is attachments,
    but only if there is real update message.
  r2885 at cubic-pc (orig r5216):  ruz | 2006-05-13 00:54:41 +0400
  * add Timezone argument in SetToMidnight
  r2886 at cubic-pc (orig r5217):  ruz | 2006-05-13 01:02:54 +0400
  * use SetToMidnight( Timezone => 'server' ) to calc start and end of the day
  r2888 at cubic-pc (orig r5218):  ruz | 2006-05-13 04:31:33 +0400
  * get rid of "masks earlier declaration" warnings
  r2889 at cubic-pc (orig r5238):  ruz | 2006-05-17 02:39:59 +0400
  * really noisy warning
    *NOTE* that option we use is not described in config
  r2895 at cubic-pc (orig r5249):  ruz | 2006-05-18 20:17:47 +0400
  * add bug comment
  r2896 at cubic-pc (orig r5256):  ruz | 2006-05-19 05:45:58 +0400
  * allow to complete actions in mail plugins
  r2897 at cubic-pc (orig r5257):  ruz | 2006-05-19 05:53:40 +0400
  * minor
 


Modified: rt/branches/CHALDEA-EXPERIMENTAL/etc/RT_Config.pm.in
==============================================================================

Modified: rt/branches/CHALDEA-EXPERIMENTAL/etc/initialdata
==============================================================================
--- rt/branches/CHALDEA-EXPERIMENTAL/etc/initialdata	(original)
+++ rt/branches/CHALDEA-EXPERIMENTAL/etc/initialdata	Thu May 18 22:37:34 2006
@@ -615,9 +615,9 @@
 	  { type => 'component',  name => 'QuickCreate'},
 	],
         'summary' => # loc
-	[ 
-	  { type => 'component', name => 'MyReminders' },
-          { type => 'component', name => 'Quicksearch' },
+	[ { type => 'component', name => 'Quicksearch' },
+	  { type => 'component', name => 'MySupportQueues' },
+	  { type => 'component', name => 'MyAdminQueues' },
 	  { type => 'component', name => 'RefreshHomepage' },
 	]
     },

Modified: rt/branches/CHALDEA-EXPERIMENTAL/etc/upgrade/QUEBEC/content
==============================================================================
--- rt/branches/CHALDEA-EXPERIMENTAL/etc/upgrade/QUEBEC/content	(original)
+++ rt/branches/CHALDEA-EXPERIMENTAL/etc/upgrade/QUEBEC/content	Thu May 18 22:37:34 2006
@@ -24,9 +24,9 @@
 	  { type => 'component',  name => 'QuickCreate'},
 	],
         'summary' =>
-	[ 
-	  { type => 'component', name => 'MyReminders' },
-          { type => 'component', name => 'Quicksearch' },
+	[ { type => 'component', name => 'Quicksearch' },
+	  { type => 'component', name => 'MySupportQueues' },
+	  { type => 'component', name => 'MyAdminQueues' },
 	  { type => 'component', name => 'RefreshHomepage' },
 	]
     },

Modified: rt/branches/CHALDEA-EXPERIMENTAL/html/Elements/EditCustomFieldSelect
==============================================================================

Modified: rt/branches/CHALDEA-EXPERIMENTAL/html/NoAuth/webrt.css
==============================================================================

Modified: rt/branches/CHALDEA-EXPERIMENTAL/html/Search/Bulk.html
==============================================================================

Modified: rt/branches/CHALDEA-EXPERIMENTAL/html/Search/Results.tsv
==============================================================================
--- rt/branches/CHALDEA-EXPERIMENTAL/html/Search/Results.tsv	(original)
+++ rt/branches/CHALDEA-EXPERIMENTAL/html/Search/Results.tsv	Thu May 18 22:37:34 2006
@@ -52,8 +52,8 @@
 my %known_cfs;
 
 my @attrs = qw( id QueueObj->Name Subject Status TimeEstimated TimeWorked TimeLeft Priority FinalPriority OwnerObj->Name 
-                Requestors->MemberEmailAddressesAsString DueObj->ISO ToldObj->ISO
-                CreatedObj->ISO ResolvedObj->ISO );
+                Requestors->MemberEmailAddressesAsString Cc->MemberEmailAddressesAsString AdminCc->MemberEmailAddressesAsString
+                DueObj->ISO ToldObj->ISO CreatedObj->ISO ResolvedObj->ISO );
 
 $r->content_type('application/vnd.ms-excel');
 while ( my $Ticket = $Tickets->Next()) {

Modified: rt/branches/CHALDEA-EXPERIMENTAL/html/Ticket/Create.html
==============================================================================

Modified: rt/branches/CHALDEA-EXPERIMENTAL/html/Ticket/Elements/Tabs
==============================================================================

Modified: rt/branches/CHALDEA-EXPERIMENTAL/html/Ticket/Update.html
==============================================================================

Modified: rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/Interface/Web.pm
==============================================================================

Modified: rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/ObjectCustomFieldValue_Overlay.pm
==============================================================================

Modified: rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/SearchBuilder.pm
==============================================================================
--- rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/SearchBuilder.pm	(original)
+++ rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/SearchBuilder.pm	Thu May 18 22:37:34 2006
@@ -68,7 +68,7 @@
 package RT::SearchBuilder;
 
 use RT::Base;
-use DBIx::SearchBuilder "1.27";
+use DBIx::SearchBuilder "1.40";
 
 use strict;
 use vars qw(@ISA);

Modified: rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/Ticket_Overlay.pm
==============================================================================

Modified: rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/Tickets_Overlay.pm
==============================================================================
--- rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/Tickets_Overlay.pm	(original)
+++ rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/Tickets_Overlay.pm	Thu May 18 22:37:34 2006
@@ -160,7 +160,7 @@
     LINKFIELD       => \&_LinkFieldLimit,
     CUSTOMFIELD     => \&_CustomFieldLimit,
 );
-my %can_bundle = ( WATCHERFIELD => "yes", );
+my %can_bundle = ();# WATCHERFIELD => "yes", );
 
 # Default EntryAggregator per type
 # if you specify OP, you must specify all valid OPs
@@ -885,8 +885,8 @@
     # we cache joins chain per watcher type
     # if we limit by requestor then we shouldn't join requestors again
     # for sort or limit on other requestors
-    if ( $self->{'_watcher_join_users_alias'}{ $type || 'any' } ) {
-        return $self->{'_watcher_join_users_alias'}{ $type || 'any' };
+    if ( $self->{'_sql_watcher_join_users_alias'}{ $type || 'any' } ) {
+        return $self->{'_sql_watcher_join_users_alias'}{ $type || 'any' };
     }
 
 # we always have watcher groups for ticket
@@ -947,7 +947,7 @@
         TABLE2 => 'Users',
         FIELD2 => 'id'
     );
-    return $self->{'_watcher_join_users_alias'}{ $type || 'any' } = $users;
+    return $self->{'_sql_watcher_join_users_alias'}{ $type || 'any' } = $users;
 }
 
 =head2 _WatcherMembershipLimit
@@ -1157,63 +1157,58 @@
 }
 
 
-
 =head2 _CustomFieldDecipher
- 
+
 Try and turn a CF descriptor into (cfid, cfname) object pair.
- 
 
 =cut
 
 sub _CustomFieldDecipher {
-  my ($self, $field) = @_;
+    my ($self, $field) = @_;
  
-  my $queue = 0;
-  if ( $field =~ /^(.+?)\.{(.+)}$/ ) {
-    $queue = $1;
-    $field = $2;
- }
-  $field = $1 if $field =~ /^{(.+)}$/;    # trim { }
- 
-  my $cfid;
- 
-  if ($queue) {
-    my $q = RT::Queue->new( $self->CurrentUser );
-    $q->Load($queue) if ($queue);
- 
-    my $cf;
-    if ( $q->id ) {
-      # $queue = $q->Name; # should we normalize the queue?
-      $cf = $q->CustomField($field);
+    my $queue = 0;
+    if ( $field =~ /^(.+?)\.{(.+)}$/ ) {
+        ($queue, $field) = ($1, $2);
+    }
+    $field = $1 if $field =~ /^{(.+)}$/;    # trim { }
+
+    my $cfid;
+    if ( $queue ) {
+        my $q = RT::Queue->new( $self->CurrentUser );
+        $q->Load( $queue ) if $queue;
+
+        my $cf;
+        if ( $q->id ) {
+            # $queue = $q->Name; # should we normalize the queue?
+            $cf = $q->CustomField( $field );
+        }
+        else {
+            $cf = RT::CustomField->new( $self->CurrentUser );
+            $cf->LoadByNameAndQueue( Queue => 0, Name => $field );
+        }
+        $cfid = $cf->id if $cf;
     }
-    else {
-      $cf = RT::CustomField->new( $self->CurrentUser );
-      $cf->LoadByNameAndQueue( Queue => '0', Name => $field );
-     }
-    $cfid = $cf->id if $cf;
-  }
  
-  return ($queue, $field, $cfid);
+    return ($queue, $field, $cfid);
  
 }
  
-
- 
 =head2 _CustomFieldJoin
- 
+
 Factor out the Join of custom fields so we can use it for sorting too
 
 =cut
 
 sub _CustomFieldJoin {
-  my ($self, $cfkey, $cfid, $field) = @_;
+    my ($self, $cfkey, $cfid, $field) = @_;
  
-  my $TicketCFs;
-  my $CFs;
+    my $TicketCFs;
+    my $CFs;
     # Perform one Join per CustomField
 
     if ( $self->{_sql_object_cf_alias}{$cfkey} ) {
         $TicketCFs = $self->{_sql_object_cf_alias}{$cfkey};
+        $CFs = $self->{_sql_cf_alias}{$cfkey};
     }
     else {
         if ($cfid) {
@@ -1248,7 +1243,7 @@
                     );
 
 
-            $CFs = $self->Join(
+            $CFs = $self->{_sql_cf_alias}{$cfkey} = $self->Join(
                 TYPE       => 'left',
                 ALIAS1     => $ocfalias,
                 FIELD1     => 'CustomField',
@@ -1286,7 +1281,7 @@
         );
     }
 
-  return ($TicketCFs, $CFs);
+    return ($TicketCFs, $CFs);
 }
 
 =head2 _CustomFieldLimit
@@ -1306,7 +1301,8 @@
 
     # For our sanity, we can only limit on one queue at a time
 
-    my ($queue, $field, $cfid ) = $self->_CustomFieldDecipher( $field );
+    my ($queue, $cfid);
+    ($queue, $field, $cfid ) = $self->_CustomFieldDecipher( $field );
 
 # 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.  Note that
@@ -1321,17 +1317,19 @@
     my $cfkey = $cfid ? $cfid : "$queue.$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;
 
+    unless ($cfid) {
+        $self->SUPER::Limit(
+            ALIAS           => $CFs,
+            FIELD           => 'name',
+            VALUE           => $field,
+            ENTRYAGGREGATOR => 'AND',
+        );
+    }
+    
+    $self->_OpenParen if $null_columns_ok;
+    
     $self->_SQLLimit(
         ALIAS      => $TicketCFs,
         FIELD      => 'Content',
@@ -1350,8 +1348,8 @@
             QUOTEVALUE      => 0,
             ENTRYAGGREGATOR => 'OR',
         );
+        $self->_CloseParen;
     }
-    $self->_CloseParen if $null_columns_ok;
 
     $self->_CloseParen;
 
@@ -1394,57 +1392,57 @@
            my $cfkey = $cfid ? $cfid : "$queue.$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
-             # we don't show duplicate tickets.  NOTE: I'm pretty sure
-             # this will stay mixed in for the life of the
-             # class/package, and not just for the life of the object.
-             # Potential performance issue.
-             require DBIx::SearchBuilder::Unique;
-             DBIx::SearchBuilder::Unique->import;
+               # For those cases where we are doing a join against the
+               # CF name, and don't have a CFid, use Unique to make sure
+               # we don't show duplicate tickets.  NOTE: I'm pretty sure
+               # this will stay mixed in for the life of the
+               # class/package, and not just for the life of the object.
+               # Potential performance issue.
+               require DBIx::SearchBuilder::Unique;
+               DBIx::SearchBuilder::Unique->import;
            }
            my $CFvs = $self->Join(
-                TYPE   => 'left',
-                ALIAS1 => $TicketCFs,
-                FIELD1 => 'CustomField',
-                TABLE2 => 'CustomFieldValues',
-                FIELD2 => 'CustomField',
-            );
+               TYPE   => 'left',
+               ALIAS1 => $TicketCFs,
+               FIELD1 => 'CustomField',
+               TABLE2 => 'CustomFieldValues',
+               FIELD2 => 'CustomField',
+           );
            $self->SUPER::Limit(
-                LEFTJOIN => $CFvs,
-                FIELD => 'Name',
-                QUOTEVALUE => 0,
-                VALUE => $TicketCFs . ".Content",
-                ENTRYAGGREGATOR => 'AND'
-                              );
+               LEFTJOIN => $CFvs,
+               FIELD => 'Name',
+               QUOTEVALUE => 0,
+               VALUE => $TicketCFs . ".Content",
+               ENTRYAGGREGATOR => 'AND'
+           );
 
-          push @res, { %$row, ALIAS => $CFvs, FIELD => 'SortOrder' };
-          push @res, { %$row, ALIAS => $TicketCFs, FIELD => 'Content' };
+           push @res, { %$row, ALIAS => $CFvs, FIELD => 'SortOrder' };
+           push @res, { %$row, ALIAS => $TicketCFs, FIELD => 'Content' };
        } elsif ( $field eq "Custom" && $subkey eq "Ownership") {
-         # PAW logic is "reversed"
-         my $order = "ASC";
-         if (exists $row->{ORDER} ) {
-           my $o = $row->{ORDER};
-           delete $row->{ORDER};
-           $order = "DESC" if $o =~ /asc/i;
-         }
-
-         # Unowned
-         # Else
-
-         # Ticket.Owner  1 0 0
-         my $ownerId = $self->CurrentUser->Id;
-         push @res, { %$row, FIELD => "Owner=$ownerId", ORDER => $order } ;
-
-         # Unowned Tickets 0 1 0
-         my $nobodyId = $RT::Nobody->Id;
-         push @res, { %$row, FIELD => "Owner=$nobodyId", ORDER => $order } ;
+           # PAW logic is "reversed"
+           my $order = "ASC";
+           if (exists $row->{ORDER} ) {
+               my $o = $row->{ORDER};
+               delete $row->{ORDER};
+               $order = "DESC" if $o =~ /asc/i;
+           }
 
-         push @res, { %$row, FIELD => "Priority", ORDER => $order } ;
-	}
-        else {
-            push @res, $row;
-        }
+           # Unowned
+           # Else
+
+           # Ticket.Owner  1 0 0
+           my $ownerId = $self->CurrentUser->Id;
+           push @res, { %$row, FIELD => "Owner=$ownerId", ORDER => $order } ;
+
+           # Unowned Tickets 0 1 0
+           my $nobodyId = $RT::Nobody->Id;
+           push @res, { %$row, FIELD => "Owner=$nobodyId", ORDER => $order } ;
+
+           push @res, { %$row, FIELD => "Priority", ORDER => $order } ;
+       }
+       else {
+           push @res, $row;
+       }
     }
     return $self->SUPER::OrderByCols(@res);
 }

Modified: rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/Transaction_Overlay.pm
==============================================================================

Modified: rt/branches/CHALDEA-EXPERIMENTAL/lib/t/regression/03web_compiliation_errors.t
==============================================================================

Modified: rt/branches/CHALDEA-EXPERIMENTAL/sbin/rt-test-dependencies.in
==============================================================================
--- rt/branches/CHALDEA-EXPERIMENTAL/sbin/rt-test-dependencies.in	(original)
+++ rt/branches/CHALDEA-EXPERIMENTAL/sbin/rt-test-dependencies.in	Thu May 18 22:37:34 2006
@@ -153,7 +153,7 @@
 DBI 1.37
 Test::Inline
 Class::ReturnValue 0.40
-DBIx::SearchBuilder 1.35
+DBIx::SearchBuilder 1.40
 Text::Template
 File::Spec 0.8
 HTML::Entities 


More information about the Rt-commit mailing list