[Rt-commit] r5398 - in rt/branches/CHALDEA-EXPERIMENTAL: html/Ticket/Elements lib/RT lib/RT/Interface

ruz at bestpractical.com ruz at bestpractical.com
Fri Jun 16 16:16:49 EDT 2006


Author: ruz
Date: Fri Jun 16 16:16:45 2006
New Revision: 5398

Modified:
   rt/branches/CHALDEA-EXPERIMENTAL/   (props changed)
   rt/branches/CHALDEA-EXPERIMENTAL/html/Ticket/Elements/ShowRequestor
   rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/Interface/Email.pm
   rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/Ticket_Overlay.pm
   rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/URI.pm

Log:
merge 3.4 -> QUEBEC -> CHALDEA

 r3263 at cubic-pc (orig r5397):  ruz | 2006-06-17 00:15:18 +0400
 merge 3.4 -> QUEBEC
 
  r3099 at cubic-pc (orig r5268):  jesse | 2006-05-20 01:17:41 +0400
   r13935 at hualien:  jesse | 2006-05-19 17:17:27 -0400
   * There were divergent copies of this code. The EmailParser code was more correct
  
  r3130 at cubic-pc (orig r5310):  ruz | 2006-05-27 04:39:49 +0400
  * when we could parse URI, for example object doesn't exist
    fallback to RT::URI::base resolver, so $uri->IsLocal and
    other methods wouldn't die but return undef
  r3132 at cubic-pc (orig r5315):  ruz | 2006-05-28 15:19:20 +0400
  * Use "Requestor.id = $requestor->id" search instead of search by email address
    as latter is not indexed
  r3133 at cubic-pc (orig r5317):  ruz | 2006-05-31 00:13:02 +0400
  * If current user changes owner from somebody else to nobody user,
    the action fails with "You can only reassign tickets that you own
    or that are unowned", but we must change owner if he has no right
    to own tickets in dest queue. Do it with Force and with SystemUser
    context.
 


Modified: rt/branches/CHALDEA-EXPERIMENTAL/html/Ticket/Elements/ShowRequestor
==============================================================================
--- rt/branches/CHALDEA-EXPERIMENTAL/html/Ticket/Elements/ShowRequestor	(original)
+++ rt/branches/CHALDEA-EXPERIMENTAL/html/Ticket/Elements/ShowRequestor	Fri Jun 16 16:16:45 2006
@@ -47,17 +47,14 @@
 my $rows = 10;
 my $people = $Ticket->Requestors->UserMembersObj;
 while (my $requestor=$people->Next) {
+next if $requestor->Privileged;
 my $name=$requestor->RealName || $requestor->EmailAddress;	
 my $tickets = RT::Tickets->new($session{'CurrentUser'});
-$tickets->LimitWatcher(TYPE => 'Requestor', VALUE => $requestor->EmailAddress );
-$tickets->LimitStatus( VALUE => 'open');
-$tickets->LimitStatus( VALUE => 'new');
+$tickets->FromSQL( "Requestor.id = ". $requestor->id ." AND (Status = 'open' OR Status = 'new')" );
 $tickets->RowsPerPage($rows);
-$tickets->OrderBy(FIELD => 'Priority',
-		  ORDER => 'DESC');
+$tickets->OrderBy(FIELD => 'Priority', ORDER => 'DESC');
 </%PERL>
 
-% unless ($requestor->Privileged) {
 <& /Elements/TitleBoxStart, 
 	title => "<a class='inverse' href=\"$RT::WebPath/Admin/Users/Modify.html?id=".$requestor->id."\">".loc("More about [_1]", $name)."</a>" &>
 
@@ -80,7 +77,6 @@
 
 <& /Elements/TitleBoxEnd &>
 
-% }
 %}
 <%ARGS>
 $Ticket=>undef

Modified: rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/Interface/Email.pm
==============================================================================
--- rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/Interface/Email.pm	(original)
+++ rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/Interface/Email.pm	Fri Jun 16 16:16:45 2006
@@ -416,9 +416,7 @@
 
     #Figure out who's sending this message.
 
-    foreach my $header ( 'Return-path', 'Errors-To', 'Reply-To', 'From',
-        'Sender' )
-    {
+    foreach my $header ( 'Errors-To', 'Reply-To', 'From', 'Sender' ) {
 
         # If there's a header of that name
         my $headerobj = $head->get($header);

Modified: rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/Ticket_Overlay.pm
==============================================================================
--- rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/Ticket_Overlay.pm	(original)
+++ rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/Ticket_Overlay.pm	Fri Jun 16 16:16:45 2006
@@ -1985,11 +1985,16 @@
         )
       )
     {
-        $self->Untake();
+        my $clone = RT::Ticket->new( $RT::SystemUser );
+        $clone->Load( $self->Id );
+        unless ( $clone->Id ) {
+            return ( 0, $self->loc("Couldn't load copy of ticket #[_1].", $self->Id) );
+        }
+        my ($status, $msg) = $clone->SetOwner( $RT::Nobody->Id, 'Force' );
+        $RT::Logger->error("Couldn't set owner on queue change: $msg") unless $status;
     }
 
     return ( $self->_Set( Field => 'Queue', Value => $NewQueueObj->Id() ) );
-
 }
 
 # }}}

Modified: rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/URI.pm
==============================================================================
--- rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/URI.pm	(original)
+++ rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/URI.pm	Fri Jun 16 16:16:45 2006
@@ -143,7 +143,7 @@
     
     unless ($self->Resolver->ParseURI($uri)) {
         $RT::Logger->warning("Resolver ".ref($self->Resolver)." could not parse $uri");
-        $self->{resolver} = undef; # clear resolver
+        $self->{resolver} = RT::URI::base->new( $self->CurrentUser ); # clear resolver
     	return (undef);
     }
 


More information about the Rt-commit mailing list