[Rt-commit] r7681 - in rt/branches/3.7-EXPERIMENTAL: . html/Elements/CollectionAsTable html/Elements/RT__Queue html/Elements/RT__Ticket

[jesse at bestpractical.com]

Author: jesse
Date: Tue Apr 24 15:16:29 2007
New Revision: 7681

Modified:
   rt/branches/3.7-EXPERIMENTAL/   (props changed)
   rt/branches/3.7-EXPERIMENTAL/html/Elements/CollectionAsTable/Row
   rt/branches/3.7-EXPERIMENTAL/html/Elements/CollectionList
   rt/branches/3.7-EXPERIMENTAL/html/Elements/RT__Queue/ColumnMap
   rt/branches/3.7-EXPERIMENTAL/html/Elements/RT__Ticket/ColumnMap
   rt/branches/3.7-EXPERIMENTAL/html/Elements/TicketList

Log:
 r56027 at pinglin:  jesse | 2007-04-24 15:15:43 -0400
 * Cleanup. Repeated "our $COLUMN_MAP" declarations were clobbering  each other, breaking the RT homepage and the tests, somewhat nondeterministicly. Often on postgres


Modified: rt/branches/3.7-EXPERIMENTAL/html/Elements/CollectionAsTable/Row
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Elements/CollectionAsTable/Row	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Elements/CollectionAsTable/Row	Tue Apr 24 15:16:29 2007
@@ -55,8 +55,7 @@
 $ColumnMap => {}
 $Class     => 'RT__Ticket'
 </%ARGS>
-
-<%PERL>
+<%init>
 $m->out('<tr class="' . ( $Warning ? 'warnline' : $i % 2 ? 'oddline' : 'evenline' ) . '" >' );
 my $item;
 foreach my $column ( @Format ) {
@@ -118,4 +117,4 @@
     $m->out('</td>');
 }
 $m->out('</tr>');
-</%PERL>
+</%init>

Modified: rt/branches/3.7-EXPERIMENTAL/html/Elements/CollectionList
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Elements/CollectionList	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Elements/CollectionList	Tue Apr 24 15:16:29 2007
@@ -64,7 +64,7 @@
 % }
 
 <%PERL>
-my ($i, $column_map) = (0, {});
+my $i = 0;
 while ( my $record = $Collection->Next ) {
     # Every ten rows, flush the buffer and put something on the page.
     $m->flush_buffer unless ++$i % 10;
@@ -73,7 +73,6 @@
         Format => \@Format,
         record => $record,
         maxitems => $maxitems,
-        ColumnMap => $column_map,
         Class     => $Class,
     );
 }

Modified: rt/branches/3.7-EXPERIMENTAL/html/Elements/RT__Queue/ColumnMap
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Elements/RT__Queue/ColumnMap	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Elements/RT__Queue/ColumnMap	Tue Apr 24 15:16:29 2007
@@ -50,7 +50,7 @@
 $Attr => undef
 </%ARGS>
 <%ONCE>
-our $COLUMN_MAP = {
+our $QUEUE_COLUMN_MAP = {
     id => {
         title     => '#',
         attribute => 'id',
@@ -70,21 +70,21 @@
     },
 };
 foreach my $col(qw(Name Description CorrespondAddress CommentAddress InitialPriority FinalPriority DefaultDueIn)) {
-    $COLUMN_MAP->{$col} = { attribute => $col, value => sub { return $_[0]->$col() } };
+    $QUEUE_COLUMN_MAP->{$col} = { attribute => $col, value => sub { return $_[0]->$col() } };
 }
 
 our $ColumnMap = sub {
     my $name = shift;
     my $attr = shift;
 
-    return $COLUMN_MAP->{$name}->{$attr}
-        if $COLUMN_MAP->{$name};
+    return $QUEUE_COLUMN_MAP->{$name}->{$attr}
+        if $QUEUE_COLUMN_MAP->{$name};
 
 };
 
 </%ONCE>
 <%INIT>
-$m->callback( COLUMN_MAP => $COLUMN_MAP, CallbackName => 'ColumnMap', CallbackOnce => 1 );
+$m->callback( COLUMN_MAP => $QUEUE_COLUMN_MAP, CallbackName => 'ColumnMap', CallbackOnce => 1 );
 return $ColumnMap->($Name, $Attr);
 </%INIT>
 

Modified: rt/branches/3.7-EXPERIMENTAL/html/Elements/RT__Ticket/ColumnMap
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Elements/RT__Ticket/ColumnMap	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Elements/RT__Ticket/ColumnMap	Tue Apr 24 15:16:29 2007
@@ -52,21 +52,21 @@
 
 
 <%ONCE>
-our ( $COLUMN_MAP );
+our ( $TICKET_COLUMN_MAP );
 
 my $ColumnMap = sub {
     my $name = shift;
     my $attr = shift;
 
     # First deal with the simple things from the map
-    if ( $COLUMN_MAP->{$name} ) {
-        return ( $COLUMN_MAP->{$name}->{$attr} );
+    if ( $TICKET_COLUMN_MAP->{$name} ) {
+        return ( $TICKET_COLUMN_MAP->{$name}->{$attr} );
     }
-    elsif ( (my ($mainkey, $subkey) = $name =~ /^(.*?)\.{(.+)}$/) && $COLUMN_MAP->{$1} ) {
-        return $COLUMN_MAP->{$mainkey}->{$attr}
-            unless ref $COLUMN_MAP->{$mainkey}->{$attr} eq 'CODE';
+    elsif ( (my ($mainkey, $subkey) = $name =~ /^(.*?)\.{(.+)}$/) && $TICKET_COLUMN_MAP->{$1} ) {
+        return $TICKET_COLUMN_MAP->{$mainkey}->{$attr}
+            unless ref $TICKET_COLUMN_MAP->{$mainkey}->{$attr} eq 'CODE';
 
-        return sub { $COLUMN_MAP->{$mainkey}->{$attr}->( @_, $subkey ) };
+        return sub { $TICKET_COLUMN_MAP->{$mainkey}->{$attr}->( @_, $subkey ) };
     }
 
 };
@@ -91,7 +91,7 @@
     }
 };
 
-$COLUMN_MAP = {
+$TICKET_COLUMN_MAP = {
     QueueName => {
         attribute => 'Queue',
         title     => 'Queue',
@@ -320,11 +320,11 @@
     },
 };
 
-$COLUMN_MAP->{'CF'} = $COLUMN_MAP->{'CustomField'};
+$TICKET_COLUMN_MAP->{'CF'} = $TICKET_COLUMN_MAP->{'CustomField'};
 
 </%ONCE>
 <%init>
-$m->callback( COLUMN_MAP => $COLUMN_MAP, CallbackName => 'Once', CallbackOnce => 1 );
-$m->callback( COLUMN_MAP => $COLUMN_MAP, CallbackName => 'ColumnMap' );
+$m->callback( COLUMN_MAP => $TICKET_COLUMN_MAP, CallbackName => 'Once', CallbackOnce => 1 );
+$m->callback( COLUMN_MAP => $TICKET_COLUMN_MAP, CallbackName => 'ColumnMap' );
 return $ColumnMap->( $Name, $Attr );
 </%init>

Modified: rt/branches/3.7-EXPERIMENTAL/html/Elements/TicketList
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Elements/TicketList	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Elements/TicketList	Tue Apr 24 15:16:29 2007
@@ -61,7 +61,7 @@
     maxitems => $maxitems &> 
 % }
 <%PERL>
-my ($i, $column_map) = (0, {});
+my $i = 0;
 while ( my $record = $Collection->Next ) {
     $i++;
     # Every ten rows, flush the buffer and put something on the page.
@@ -71,7 +71,6 @@
         Format => \@Format,
         record => $record,
         maxitems => $maxitems,
-        ColumnMap => $column_map,
     );
 }
 </%PERL>