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

jesse at bestpractical.com jesse at bestpractical.com
Sun Jul 3 18:12:44 EDT 2005


Author: jesse
Date: Sun Jul  3 18:12:44 2005
New Revision: 3335

Modified:
   rt/branches/CHALDEA-EXPERIMENTAL/   (props changed)
   rt/branches/CHALDEA-EXPERIMENTAL/html/Elements/ShowCustomFieldWikitext
   rt/branches/CHALDEA-EXPERIMENTAL/html/Ticket/Display.html
   rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/Ticket_Overlay.pm
Log:
 r22151 at hualien:  jesse | 2005-07-03 17:50:36 -0400
  r22103 at hualien:  jesse | 2005-07-03 16:27:27 -0400
   r22038 at hualien:  jesse | 2005-07-01 19:28:24 -0400
    r21984 at hualien (orig r3261):  kevinr | 2005-06-28 18:47:38 -0400
     r5752 at sad-girl-in-snow:  kevinr | 2005-06-28 17:45:36 -0500
     RT-Ticket: 6745
     RT-Status: resolved
     RT-Update: correspond
     
     Applied Seph's patch to add a BeforeShowHistory callback.
    
    r22028 at hualien (orig r3270):  alexmv | 2005-07-01 00:32:06 -0400
     r4555 at zoq-fot-pik:  chmrr | 2005-06-30 17:36:05 -0400
      * WikiText updates to auto-link http:// style links
    
    r22029 at hualien (orig r3271):  alexmv | 2005-07-01 00:32:10 -0400
     r4556 at zoq-fot-pik:  chmrr | 2005-06-30 17:58:57 -0400
      * Don't assume link is happy on creation
    
    r22030 at hualien (orig r3272):  alexmv | 2005-07-01 00:32:15 -0400
    
   
  
 


Modified: rt/branches/CHALDEA-EXPERIMENTAL/html/Elements/ShowCustomFieldWikitext
==============================================================================
--- rt/branches/CHALDEA-EXPERIMENTAL/html/Elements/ShowCustomFieldWikitext	(original)
+++ rt/branches/CHALDEA-EXPERIMENTAL/html/Elements/ShowCustomFieldWikitext	Sun Jul  3 18:12:44 2005
@@ -45,7 +45,7 @@
 %# END BPS TAGGED BLOCK }}}
 % my $content = $Object->LargeContent || $Object->Content;
 % $content = $m->comp('/Elements/ScrubHTML', Content => $content);
-% my $wiki_content = Text::WikiFormat::format( $content."\n" );
+% my $wiki_content = Text::WikiFormat::format( $content."\n" , {}, { extended => 1, absolute_links => 1 });
 <%$wiki_content|n%>
 <%init>
 use Text::WikiFormat;

Modified: rt/branches/CHALDEA-EXPERIMENTAL/html/Ticket/Display.html
==============================================================================
--- rt/branches/CHALDEA-EXPERIMENTAL/html/Ticket/Display.html	(original)
+++ rt/branches/CHALDEA-EXPERIMENTAL/html/Ticket/Display.html	Sun Jul  3 18:12:44 2005
@@ -58,6 +58,9 @@
 <& /Elements/TitleBoxEnd &>
 
 <BR>
+
+<& /Elements/Callback, _CallbackName => 'BeforeShowHistory', Ticket => $TicketObj, %ARGS &>
+
 <& /Ticket/Elements/ShowHistory , 
       Ticket => $TicketObj, 
       Tickets => $Tickets, 

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	Sun Jul  3 18:12:44 2005
@@ -2540,6 +2540,8 @@
 ok ($id,$msg);
 ($id,$msg) =$ticket->AddLink(Type => 'RefersTo', Target => $ticket2->id);
 ok($id,$msg);
+($id,$msg) =$ticket->AddLink(Type => 'RefersTo', Target => -1);
+ok(!$id,$msg);
 
 =end testing 
 
@@ -2588,8 +2590,15 @@
         $other_ticket_uri->FromURI( $args{'Base'} );
     }
 
-    if ( defined $other_ticket_uri->Resolver and 
-         $other_ticket_uri->Resolver->Scheme eq 'fsck.com-rt') {
+    unless ( $other_ticket_uri->Resolver && $other_ticket_uri->Scheme ) {
+	my $msg = $args{'Target'} ? $self->loc("Couldn't resolve target '[_1]' into a URI.", $args{'Target'})
+          : $self->loc("Couldn't resolve base '[_1]' into a URI.", $args{'Base'});
+        $RT::Logger->warning( "$self $msg\n" );
+
+        return( 0, $msg );
+    }
+
+    if ( $other_ticket_uri->Resolver->Scheme eq 'fsck.com-rt') {
         my $object = $other_ticket_uri->Resolver->Object;
 
         if (   UNIVERSAL::isa( $object, 'RT::Ticket' )


More information about the Rt-commit mailing list