[Rt-commit] r11019 - in rt/branches/3.8-TESTING: html/Admin/Queues lib lib/RT lib/RT/Interface

ruz at bestpractical.com ruz at bestpractical.com
Thu Mar 6 15:51:14 EST 2008


Author: ruz
Date: Thu Mar  6 15:51:09 2008
New Revision: 11019

Modified:
   rt/branches/3.8-TESTING/html/Admin/Queues/Modify.html
   rt/branches/3.8-TESTING/lib/RT.pm.in
   rt/branches/3.8-TESTING/lib/RT/Action/SendEmail.pm
   rt/branches/3.8-TESTING/lib/RT/Interface/Email.pm
   rt/branches/3.8-TESTING/lib/RT/Queue_Overlay.pm
   rt/branches/3.8-TESTING/lib/RT/System.pm

Log:
* integrate BrandedQueues

Modified: rt/branches/3.8-TESTING/html/Admin/Queues/Modify.html
==============================================================================
--- rt/branches/3.8-TESTING/html/Admin/Queues/Modify.html	(original)
+++ rt/branches/3.8-TESTING/html/Admin/Queues/Modify.html	Thu Mar  6 15:51:09 2008
@@ -67,6 +67,10 @@
 <td colspan="3"><input name="Description" value="<% ($Create) ? "" : $QueueObj->Description %>" size="60" /></td>
 </tr>
 
+<tr><td align="right"><&|/l&>Subject Tag</&>:</td>
+<td colspan="3"><input name="SubjectTag" value="<% $ARGS{'SubjectTag'} || ($Create ? "" : $QueueObj->SubjectTag) %>" size="60" /></td>
+</tr>
+
 <tr><td align="right"><&|/l&>Reply Address</&>:</td>
 <td><input name="CorrespondAddress" value="<% ($Create) ? "" : $QueueObj->CorrespondAddress %>" />
 <br /><span><em><&|/l , RT->Config->Get('CorrespondAddress')&>(If left blank, will default to [_1])</&></em></span></td>
@@ -140,7 +144,7 @@
 if ( $QueueObj->Id ) {
     delete $session{'create_in_queues'};
     my @attribs= qw(Description CorrespondAddress CommentAddress Name
-        InitialPriority FinalPriority DefaultDueIn Sign Encrypt Disabled);
+        InitialPriority FinalPriority DefaultDueIn Sign Encrypt SubjectTag Disabled);
 
     # we're asking about enabled on the web page but really care about disabled
     if ( $SetEnabled ) {

Modified: rt/branches/3.8-TESTING/lib/RT.pm.in
==============================================================================
--- rt/branches/3.8-TESTING/lib/RT.pm.in	(original)
+++ rt/branches/3.8-TESTING/lib/RT.pm.in	Thu Mar  6 15:51:09 2008
@@ -439,7 +439,7 @@
     $Nobody->LoadByName('Nobody');
 
     require RT::System;
-    $System = new RT::System;
+    $System = RT::System->new( $SystemUser );
 }
 
 =head1 CLASS METHODS

Modified: rt/branches/3.8-TESTING/lib/RT/Action/SendEmail.pm
==============================================================================
--- rt/branches/3.8-TESTING/lib/RT/Action/SendEmail.pm	(original)
+++ rt/branches/3.8-TESTING/lib/RT/Action/SendEmail.pm	Thu Mar  6 15:51:09 2008
@@ -806,7 +806,7 @@
     $self->TemplateObj->MIMEObj->head->replace(
         Subject => RT::Interface::Email::AddSubjectTag(
             $self->TemplateObj->MIMEObj->head->get('Subject'),
-            $self->TicketObj->id,
+            $self->TicketObj,
         ),
     );
 }

Modified: rt/branches/3.8-TESTING/lib/RT/Interface/Email.pm
==============================================================================
--- rt/branches/3.8-TESTING/lib/RT/Interface/Email.pm	(original)
+++ rt/branches/3.8-TESTING/lib/RT/Interface/Email.pm	Thu Mar  6 15:51:09 2008
@@ -659,8 +659,9 @@
         $from = $txn->CurrentUser->UserObj->EmailAddress;
     } else {
         # XXX: what if want to forward txn of other object than ticket?
-        $subject = AddSubjectTag( $subject, $txn->ObjectId );
-        $from = $txn->Object->QueueObj->CorrespondAddress
+        my $obj = $txn->Object;
+        $subject = AddSubjectTag( $subject, $obj );
+        $from = $obj->QueueObj->CorrespondAddress
             || RT->Config->Get('CorrespondAddress');
     }
     $mail->head->set( Subject => "Fwd: $subject" );
@@ -1027,34 +1028,49 @@
 
 sub ParseTicketId {
     my $Subject = shift;
-    my $id;
 
     my $rtname = RT->Config->Get('rtname');
     my $test_name = RT->Config->Get('EmailSubjectTagRegex') || qr/\Q$rtname\E/i;
 
+    my $id;
     if ( $Subject =~ s/\[$test_name\s+\#(\d+)\s*\]//i ) {
-        my $id = $1;
-        $RT::Logger->debug("Found a ticket ID. It's $id");
-        return $id;
+        $id = $1;
     } else {
-        return undef;
+        foreach my $tag ( RT->System->SubjectTag ) {
+            next unless $Subject =~ s/\[\Q$tag\E\s+\#(\d+)\s*\]//i;
+            $id = $1;
+            last;
+        }
     }
+    return undef unless $id;
+
+    $RT::Logger->debug("Found a ticket ID. It's $id");
+    return $id;
 }
 
 sub AddSubjectTag {
     my $subject = shift;
-    my $id      = shift;
+    my $ticket  = shift;
+    unless ( ref $ticket ) {
+        my $tmp = RT::Ticket->new( $RT::SystemUser );
+        $tmp->Load( $ticket );
+        $ticket = $tmp;
+    }
+    my $id = $ticket->id;
+    my $queue_tag = $ticket->QueueObj->SubjectTag;
 
     my $tag_re = RT->Config->Get('EmailSubjectTagRegex');
     unless ( $tag_re ) {
-        my $rtname = RT->Config->Get('rtname');
-        $tag_re = qr/\Q$rtname\E/o;
+        my $tag = $queue_tag || RT->Config->Get('rtname');
+        $tag_re = qr/\Q$tag\E/;
+    } elsif ( $queue_tag ) {
+        $tag_re = qr/$tag_re|\Q$queue_tag\E/;
     }
     return $subject if $subject =~ /\[$tag_re\s+#$id\]/;
 
     $subject =~ s/(\r\n|\n|\s)/ /gi;
     chomp $subject;
-    return "[". RT->Config->Get('rtname') ." #$id] $subject";
+    return "[". ($queue_tag || RT->Config->Get('rtname')) ." #$id] $subject";
 }
 
 

Modified: rt/branches/3.8-TESTING/lib/RT/Queue_Overlay.pm
==============================================================================
--- rt/branches/3.8-TESTING/lib/RT/Queue_Overlay.pm	(original)
+++ rt/branches/3.8-TESTING/lib/RT/Queue_Overlay.pm	Thu Mar  6 15:51:09 2008
@@ -505,6 +505,38 @@
     return ($status, $self->loc('Encrypting disabled'));
 }
 
+sub SubjectTag {
+    my $self = shift;
+    return RT->System->SubjectTag( $self );
+}
+
+sub SetSubjectTag {
+    my $self = shift;
+    my $value = shift;
+
+    return ( 0, $self->loc('Permission Denied') )
+        unless $self->CurrentUserHasRight('AdminQueue');
+
+    my $attr = RT->System->FirstAttribute('BrandedSubjectTag');
+    my $map = $attr ? $attr->Content : {};
+    if ( defined $value && length $value ) {
+        $map->{ $self->id } = $value;
+    } else {
+        delete $map->{ $self->id };
+    }
+
+    my ($status, $msg) = RT->System->SetAttribute(
+        Name        => 'BrandedSubjectTag',
+        Description => 'Queue id => subject tag map',
+        Content     => $map,
+    );
+    return ($status, $msg) unless $status;
+    return ($status, $self->loc(
+        "SubjectTag changed to [_1]", 
+        (defined $value && length $value)? $value : $self->loc("(no value)")
+    ))
+}
+
 # {{{ sub Templates
 
 =head2 Templates

Modified: rt/branches/3.8-TESTING/lib/RT/System.pm
==============================================================================
--- rt/branches/3.8-TESTING/lib/RT/System.pm	(original)
+++ rt/branches/3.8-TESTING/lib/RT/System.pm	Thu Mar  6 15:51:09 2008
@@ -65,15 +65,16 @@
 
 
 package RT::System;
-use base qw /RT::Record/;
+
 use strict;
+use warnings;
+use base qw/RT::Record/;
 
 use RT::ACL;
-use vars qw/ $RIGHTS/;
 
 # System rights are rights granted to the whole system
 # XXX TODO Can't localize these outside of having an object around.
-$RIGHTS = {
+our $RIGHTS = {
     SuperUser              => 'Do anything and everything',           # loc_pair
     AdminAllPersonalGroups =>
       "Create, delete and modify the members of any user's personal groups"
@@ -134,16 +135,10 @@
 
 Returns RT::System's id. It's 1. 
 
-
-
-
 =cut
 
 *Id = \&id;
-
-sub id {
-    return (1);
-}
+sub id { return 1 }
 
 =head2 Load
 
@@ -152,18 +147,26 @@
 
 =cut
 
-sub Load {
-	return (1);
-}
+sub Load    { return 1 }
+sub Name    { return 'RT System' }
+sub __Set   { return 0 }
+sub __Value { return 0 }
+sub Create  { return 0 }
+sub Delete  { return 0 }
 
-sub Name {
-    return 'RT System';
-}
+sub SubjectTag {
+    my $self = shift;
+    my $queue = shift;
 
-sub __Set { 0 }
-sub __Value { 0 }
-sub Create { 0 }
-sub Delete { 0 }
+    my $map = $self->FirstAttribute('BrandedSubjectTag');
+    $map = $map->Content if $map;
+    return $queue ? undef : () unless $map;
+
+    return $map->{ $queue->id } if $queue;
+
+    my %seen = ();
+    return grep !$seen{lc $_}++, values %$map;
+}
 
 eval "require RT::System_Vendor";
 die $@ if ($@ && $@ !~ qr{^Can't locate RT/System_Vendor.pm});


More information about the Rt-commit mailing list