[rt-commit] [svn] r476 - rt/trunk/lib/RT

jesse at fsck.com jesse at fsck.com
Fri Mar 5 02:06:54 EST 2004


Author: jesse
Date: Fri Mar  5 02:06:53 2004
New Revision: 476

Modified:
   rt/trunk/lib/RT/Ticket_Overlay.pm
   rt/trunk/lib/RT/Transaction_Overlay.pm
Log:
Applied Dirk Pape's patch for merge descriptions from http://page.mi.fu-berlin.de/~pape/rt3/patches/rt/description_for_merge.patch


Modified: rt/trunk/lib/RT/Ticket_Overlay.pm
==============================================================================
--- rt/trunk/lib/RT/Ticket_Overlay.pm	(original)
+++ rt/trunk/lib/RT/Ticket_Overlay.pm	Fri Mar  5 02:06:53 2004
@@ -157,6 +157,10 @@
                    Mode => 'Target', },
     DependedOnBy => { Type => 'DependsOn',
                       Mode => 'Base', },
+#!!pape:description_for_merge {{
+    MergedInto => { Type => 'MergedInto',
+                   Mode => 'Target', },
+#!!pape:description_for_merge }}
 
 );
 
@@ -175,6 +179,10 @@
                 Target => 'ReferredToBy', },
     DependsOn => { Base => 'DependsOn',
                    Target => 'DependedOnBy', },
+#!!pape:description_for_merge {{
+    MergedInto => { Base => 'MergedInto',
+                   Target => 'MergedInto', },
+#!!pape:description_for_merge }}
 
 );
 

Modified: rt/trunk/lib/RT/Transaction_Overlay.pm
==============================================================================
--- rt/trunk/lib/RT/Transaction_Overlay.pm	(original)
+++ rt/trunk/lib/RT/Transaction_Overlay.pm	Fri Mar  5 02:06:53 2004
@@ -597,6 +597,11 @@
             elsif ( $self->Field eq 'HasMember' ) {
                 return $self->loc( "Member [_1] added", $value );
             }
+#!!pape:description_for_merge {{
+            elsif ( $self->Field eq 'MergedInto' ) {
+                return $self->loc( "Merged into [_1]", $value );
+            }
+#!!pape:description_for_merge }}
         }
         else {
             return ( $self->Data );



More information about the Rt-commit mailing list