[Rt-commit] r11822 - in rt/branches/3.8-TESTING: . etc html/Search html/SelfService/Elements html/Ticket html/Ticket/Elements html/Ticket/Graphs html/Ticket/Graphs/Elements lib/RT/Graph lib/RT/Interface/Web sbin

alexmv at bestpractical.com alexmv at bestpractical.com
Tue Apr 22 15:34:52 EDT 2008


Author: alexmv
Date: Tue Apr 22 15:34:51 2008
New Revision: 11822

Modified:
   rt/branches/3.8-TESTING/   (props changed)
   rt/branches/3.8-TESTING/configure.ac
   rt/branches/3.8-TESTING/etc/RT_Config.pm.in
   rt/branches/3.8-TESTING/html/Admin/Users/Modify.html
   rt/branches/3.8-TESTING/html/Search/Simple.html
   rt/branches/3.8-TESTING/html/SelfService/Elements/Tabs
   rt/branches/3.8-TESTING/html/Ticket/Elements/ShowSummary
   rt/branches/3.8-TESTING/html/Ticket/Elements/ShowTransaction
   rt/branches/3.8-TESTING/html/Ticket/Graphs/Elements/EditGraphProperties
   rt/branches/3.8-TESTING/html/Ticket/Graphs/Elements/ShowGraph
   rt/branches/3.8-TESTING/html/Ticket/Graphs/dhandler
   rt/branches/3.8-TESTING/html/Ticket/Graphs/index.html
   rt/branches/3.8-TESTING/html/Ticket/History.html
   rt/branches/3.8-TESTING/html/Ticket/ModifyLinks.html
   rt/branches/3.8-TESTING/lib/RT/Graph/Tickets.pm
   rt/branches/3.8-TESTING/lib/RT/Interface/Web/Request.pm
   rt/branches/3.8-TESTING/sbin/rt-test-dependencies.in

Log:
 r30065 at kohr-ah:  chmrr | 2008-04-22 15:32:12 -0400
  * Move --with-devel-mode to --enable-devel-mode ("with" will still work)
  * Add --enable-graphviz, which defaults based on libgraph presence
  * Move all old-style callbacks to $m->callback
  * Rip out Type = Member of graphs, which had no UI


Modified: rt/branches/3.8-TESTING/configure.ac
==============================================================================
--- rt/branches/3.8-TESTING/configure.ac	(original)
+++ rt/branches/3.8-TESTING/configure.ac	Tue Apr 22 15:34:51 2008
@@ -248,19 +248,38 @@
 AC_ARG_WITH(apachectl,
             AC_HELP_STRING([--with-apachectl],
                            [instruct RT where to find your apachectl]),
-
             APACHECTL=$withval, 
             APACHECTL=`which apachectl`)
 AC_SUBST(APACHECTL)
 
 dnl RT's "maintainer mode"
-AC_ARG_WITH(devel-mode,
-            AC_HELP_STRING([--with-devel-mode],
+AC_ARG_WITH(devel-mode,[],RT_DEVEL_MODE=$withval,RT_DEVEL_MODE="0")
+AC_ARG_ENABLE(devel-mode,
+            AC_HELP_STRING([--enable-devel-mode],
                            [Turn on development aids that might hurt you in production]),
-
-            RT_DEVEL_MODE="1", 
-            RT_DEVEL_MODE="0")
+            RT_DEVEL_MODE=$enableval,
+            RT_DEVEL_MODE=$RT_DEVEL_MODE)
+if test "$RT_DEVEL_MODE" = yes; then
+        RT_DEVEL_MODE="1"
+else
+        RT_DEVEL_MODE="0"
+fi
 AC_SUBST(RT_DEVEL_MODE)
+
+dnl RT's GraphViz dependency charts
+AC_CHECK_LIB([graph],[aginitlib],RT_GRAPHVIZ="1")
+AC_ARG_WITH(graphviz,[],RT_GRAPHVIZ=$withval)
+AC_ARG_ENABLE(graphviz,
+            AC_HELP_STRING([--enable-graphviz],
+                           [Turns on support for RT's GraphViz dependency charts]),
+            RT_GRAPHVIZ=$enableval)
+if test "$RT_GRAPHVIZ" = yes; then
+        RT_GRAPHVIZ="1"
+elif test "$RT_GRAPHVIZ" = no; then
+        RT_GRAPHVIZ="0"
+fi
+AC_SUBST(RT_GRAPHVIZ)
+
 dnl This section maps the variable names this script 'natively' generates
 dnl to their existing names. They should be removed from here as the .in
 dnl files are changed to use the new names.
@@ -297,28 +316,28 @@
 AC_CONFIG_FILES([
                  etc/upgrade/3.8-branded-queues-extension
                  etc/upgrade/3.8-ical-extension
-		 sbin/rt-dump-database
-		 sbin/rt-setup-database
-		 sbin/rt-test-dependencies
-         sbin/rt-clean-sessions
-         sbin/rt-shredder
-         sbin/rt-validator
-         sbin/rt-notify-group-admin
- 		 bin/mason_handler.fcgi
- 		 bin/mason_handler.scgi
- 		 bin/standalone_httpd
- 		 bin/rt-crontool
- 		 bin/rt-mailgate
-		 bin/rt],
-		[chmod ug+x $ac_file]
+                 sbin/rt-dump-database
+                 sbin/rt-setup-database
+                 sbin/rt-test-dependencies
+                 sbin/rt-clean-sessions
+                 sbin/rt-shredder
+                 sbin/rt-validator
+                 sbin/rt-notify-group-admin
+                 bin/mason_handler.fcgi
+                 bin/mason_handler.scgi
+                 bin/standalone_httpd
+                 bin/rt-crontool
+                 bin/rt-mailgate
+                 bin/rt],
+                [chmod ug+x $ac_file]
                )
 
 dnl All other generated files
 AC_CONFIG_FILES([
-		 Makefile
-		 etc/RT_Config.pm
-		 lib/RT.pm
- 		 bin/mason_handler.svc
-		 bin/webmux.pl],
+                 Makefile
+                 etc/RT_Config.pm
+                 lib/RT.pm
+                 bin/mason_handler.svc
+                 bin/webmux.pl],
                )
 AC_OUTPUT

Modified: rt/branches/3.8-TESTING/etc/RT_Config.pm.in
==============================================================================
--- rt/branches/3.8-TESTING/etc/RT_Config.pm.in	(original)
+++ rt/branches/3.8-TESTING/etc/RT_Config.pm.in	Tue Apr 22 15:34:51 2008
@@ -727,6 +727,9 @@
 
 Set($DevelMode, '@RT_DEVEL_MODE@');
 
+eval {require GraphViz;};
+Set($DisableGraphViz, $@ ? 1 : 0);
+
 # }}}
 
 # {{{ Deprecated options

Modified: rt/branches/3.8-TESTING/html/Admin/Users/Modify.html
==============================================================================
--- rt/branches/3.8-TESTING/html/Admin/Users/Modify.html	(original)
+++ rt/branches/3.8-TESTING/html/Admin/Users/Modify.html	Tue Apr 22 15:34:51 2008
@@ -134,7 +134,7 @@
 </table>
 % }
 </&>
-<& /Elements/Callback, _CallbackName => 'LeftColumnBottom', UserObj => $UserObj, %ARGS &>
+% $m->callback( %ARGS, CallbackName => 'LeftColumnBottom', UserObj => $UserObj );
 </td>
 
 <td valign="top" class="boxcontainer">
@@ -222,7 +222,7 @@
 % }
 </table>
 </&>
-<& /Elements/Callback, _CallbackName => 'RightColumnBottom', UserObj => $UserObj, %ARGS &>
+% $m->callback( %ARGS, CallbackName => 'RightColumnBottom', UserObj => $UserObj );
 </td></tr>
 <tr>
 <td colspan="2">

Modified: rt/branches/3.8-TESTING/html/Search/Simple.html
==============================================================================
--- rt/branches/3.8-TESTING/html/Search/Simple.html	(original)
+++ rt/branches/3.8-TESTING/html/Search/Simple.html	Tue Apr 22 15:34:51 2008
@@ -51,7 +51,7 @@
     Title => $title
 &>
 
-<& /Elements/Callback, _CallbackName => 'PreForm', %ARGS &>
+% $m->callback( %ARGS, CallbackName => 'PreForm' );
 
 <div id="SimpleSearchForm">
 <form action="Simple.html" method="get">
@@ -69,7 +69,7 @@
 
 </form>
 
-<& /Elements/Callback, _CallbackName => 'PostForm', %ARGS &>
+% $m->callback( %ARGS, CallbackName => 'PostForm' );
 
 </div>
 
@@ -94,7 +94,7 @@
         TicketsObj => $tickets,
     );
 
-    $m->comp('/Elements/Callback', %ARGS, _CallbackName => 'SearchArgs', args => \%args);
+    $m->callback( %ARGS, CallbackName => 'SearchArgs', args => \%args);
 
     my $search = RT::Search::Googleish->new(%args);
 

Modified: rt/branches/3.8-TESTING/html/SelfService/Elements/Tabs
==============================================================================
--- rt/branches/3.8-TESTING/html/SelfService/Elements/Tabs	(original)
+++ rt/branches/3.8-TESTING/html/SelfService/Elements/Tabs	Tue Apr 22 15:34:51 2008
@@ -45,7 +45,7 @@
 %# those contributions and any derivatives thereof.
 %# 
 %# END BPS TAGGED BLOCK }}}
-<& /Elements/Callback, tabs => $tabs, %ARGS &>
+% $m->callback( %ARGS, tabs => $tabs );
 <& /Elements/PageLayout,
     current_toptab => $current_toptab,
     current_tab => $current_tab,

Modified: rt/branches/3.8-TESTING/html/Ticket/Elements/ShowSummary
==============================================================================
--- rt/branches/3.8-TESTING/html/Ticket/Elements/ShowSummary	(original)
+++ rt/branches/3.8-TESTING/html/Ticket/Elements/ShowSummary	Tue Apr 22 15:34:51 2008
@@ -93,11 +93,11 @@
 		class => 'ticket-info-dates' &>
 	  <& /Ticket/Elements/ShowDates, Ticket => $Ticket &>
 	  </&>
-
+% my (@extra);
+% push @extra, titleright_raw => '<a href="'. $RT::WebPath. '/Ticket/Graphs/index.html?id='.$Ticket->id.'">'.loc('Graph').'</a>' unless $RT::DisableGraphViz;
 	  <&| /Widgets/TitleBox, title => loc('Links'), 
 		title_href => RT->Config->Get('WebPath')."/Ticket/ModifyLinks.html?id=".$Ticket->Id, 
-        titleright_raw => '<a href="'. $RT::WebPath. '/Ticket/Graphs/index.html?id='.$Ticket->id .'&Type=Links">'.loc('Graph').'</a>',
-		class => 'ticket-info-links' &>
+		class => 'ticket-info-links', @extra &>
 	        <& /Elements/ShowLinks, Ticket => $Ticket &>
           </&>
 % $m->callback( %ARGS, CallbackName => 'RightColumn' );

Modified: rt/branches/3.8-TESTING/html/Ticket/Elements/ShowTransaction
==============================================================================
--- rt/branches/3.8-TESTING/html/Ticket/Elements/ShowTransaction	(original)
+++ rt/branches/3.8-TESTING/html/Ticket/Elements/ShowTransaction	Tue Apr 22 15:34:51 2008
@@ -46,7 +46,7 @@
 %# 
 %# END BPS TAGGED BLOCK }}}
 <div class="ticket-transaction <% $type_class %> <% $RowNum % 2 ? 'odd' : 'even' %>">
-% $m->comp('/Elements/Callback', _CallbackName => 'ModifyDisplay', titlebar_cmd => \$titlebar_commands, Transaction => $Transaction, %ARGS);
+% $m->callback( titlebar_cmd => \$titlebar_commands, Transaction => $Transaction, %ARGS, CallbackName => 'ModifyDisplay' );
 
 <table width="100%" cellspacing="0" cellpadding="2" border="0">
 % $m->callback( titlebar_cmd => \$titlebar_commands, Transaction => $Transaction, %ARGS, CallbackName => 'ModifyCommand' );

Modified: rt/branches/3.8-TESTING/html/Ticket/Graphs/Elements/EditGraphProperties
==============================================================================
--- rt/branches/3.8-TESTING/html/Ticket/Graphs/Elements/EditGraphProperties	(original)
+++ rt/branches/3.8-TESTING/html/Ticket/Graphs/Elements/EditGraphProperties	Tue Apr 22 15:34:51 2008
@@ -80,23 +80,6 @@
 <br />
 % }
 
-<%PERL>
-if ( $AllowAdditionalProperties ) {
-    for my $i ( 1..($Depth||6) ) {
-        my @default;
-        if ( my $tmp = $ARGS{ 'Level-'. $i .'-Properties' } ) {
-            @default = ref $tmp? @$tmp : ($tmp);
-        }
-
-        $m->comp('SELF:Properties',
-            Level => $i,
-            Available => \@properties,
-            Default => \@default,
-        );
-    }
-}
-</%PERL>
-
 <& /Elements/Submit, Label => loc('Update Graph'), Name => 'Update' &>
 
 </&>
@@ -106,7 +89,6 @@
 $Depth => 3
 $FillUsing => ''
 $ShowLinkDescriptions => 0
-$AllowAdditionalProperties => 1
 </%ARGS>
 <%INIT>
 require RT::Graph::Tickets;

Modified: rt/branches/3.8-TESTING/html/Ticket/Graphs/Elements/ShowGraph
==============================================================================
--- rt/branches/3.8-TESTING/html/Ticket/Graphs/Elements/ShowGraph	(original)
+++ rt/branches/3.8-TESTING/html/Ticket/Graphs/Elements/ShowGraph	Tue Apr 22 15:34:51 2008
@@ -45,13 +45,12 @@
 %# those contributions and any derivatives thereof.
 %# 
 %# END BPS TAGGED BLOCK }}}
-<div><img src="<% $RT::WebPath %>/Ticket/Graphs/<% $Type %>/<% $id %>?<% $m->comp('/Elements/QueryString', %ARGS) %>" usemap="<% $graph->{'NAME'} || 'test' %>" style="border: none" />
+<div><img src="<% $RT::WebPath %>/Ticket/Graphs/<% $id %>?<% $m->comp('/Elements/QueryString', %graphargs) %>" usemap="#<% $graph->{'NAME'} || 'test' %>" style="border: none" />
 <% Encode::decode_utf8( $graph->as_cmapx ) |n %>
 </div>
 <& ShowLegends, %ARGS, Ticket => $ticket &>
 <%ARGS>
 $id => undef;
-$Type => 'Links',
 </%ARGS>
 <%INIT>
 my $ticket = RT::Ticket->new( $session{'CurrentUser'} );
@@ -62,16 +61,11 @@
 }
 $ARGS{'id'} = $id = $ticket->id;
 
-$Type = ucfirst lc $Type;
-unless ( $Type eq 'Links' || $Type eq 'Members' ) {
-    $RT::Logger->error("'$Type' is incorrect type of ticket graph");
-    $Type = 'Links';
-}
-
-require RT::Graph::Tickets;
-my $method = 'Ticket'. $Type;
-my $graph = RT::Graph::Tickets->$method(
+my $graph = RT::Graph::Tickets->TicketLinks(
     %ARGS,
     Ticket => $ticket,
 );
+
+my %graphargs;
+$graphargs{$_} = $ARGS{$_} for qw/Depth FillUsing/;
 </%INIT>

Modified: rt/branches/3.8-TESTING/html/Ticket/Graphs/dhandler
==============================================================================
--- rt/branches/3.8-TESTING/html/Ticket/Graphs/dhandler	(original)
+++ rt/branches/3.8-TESTING/html/Ticket/Graphs/dhandler	Tue Apr 22 15:34:51 2008
@@ -49,8 +49,8 @@
 my $arg = $m->dhandler_arg;
 
 my ($type, $id);
-if ( $arg =~ m{^(Members|Links)/(\d+)$}i ) {
-    ($type, $id) = ($1, $2);
+if ( $arg =~ m{^(\d+)$}i ) {
+    ($id) = ($1);
 } else {
     return $m->abort( 404 );
 }
@@ -63,8 +63,7 @@
 }
 
 require RT::Graph::Tickets;
-my $method = 'Ticket'. ucfirst lc $type;
-my $graph = RT::Graph::Tickets->$method(
+my $graph = RT::Graph::Tickets->TicketLinks(
     %ARGS,
     Ticket => $ticket,
 );

Modified: rt/branches/3.8-TESTING/html/Ticket/Graphs/index.html
==============================================================================
--- rt/branches/3.8-TESTING/html/Ticket/Graphs/index.html	(original)
+++ rt/branches/3.8-TESTING/html/Ticket/Graphs/index.html	Tue Apr 22 15:34:51 2008
@@ -45,10 +45,10 @@
 %# those contributions and any derivatives thereof.
 %# 
 %# END BPS TAGGED BLOCK }}}
-<& /Elements/Header, Title => $title &>
+<& /Elements/Header, Title => loc( "Ticket #[_1] relationships graph", $id ) &>
 <& /Ticket/Elements/Tabs,
     Ticket => $ticket,
-    Title => $title,
+    Title => loc( "Ticket #[_1] relationships graph", $id ),
     current_tab => "Ticket/ModifyLinks.html?id=$id",
 &>
 
@@ -58,18 +58,15 @@
 
 <form action="<% $RT::WebPath %><% $m->request_comp->path %>">
 <input type="hidden" class="hidden" name="id" value="<% $id %>" />
-<input type="hidden" class="hidden" name="Type" value="<% $ARGS{'Type'} %>" />
 
 <& Elements/EditGraphProperties,
     %ARGS,
     Ticket => $ticket,
-    Type   => $Type,
-    AllowAdditionalProperties => $Type eq 'Links'? 0 : 1,
 &>
 
 <& /Search/Elements/EditSearches,
     Name => 'Owner',
-    SearchType => $saved_search->{SearchType},
+    Type => $saved_search->{SearchType},
     AllowCopy => 0,
     CurrentSearch => $saved_search->{CurrentSearch},
     SearchId => $saved_search->{SearchId},
@@ -83,7 +80,7 @@
 use RT::Graph::Tickets;
 my @results;
 
-my @save_arguments = qw(Type id Depth FillUsing ShowLinkDescriptions);
+my @save_arguments = qw(id Depth FillUsing ShowLinkDescriptions);
 foreach my $level ( 0 .. 6 ) {
     push @save_arguments, "Level-". $level ."-Properties";
 }
@@ -96,19 +93,5 @@
 my $id = $ARGS{'id'};
 my $ticket = LoadTicket( $id );
 $ARGS{'id'} = $id = $ticket->id;
-
-my $Type = $ARGS{'Type'} || 'Links';
-$Type = ucfirst lc $Type;
-unless ( $Type eq 'Links' || $Type eq 'Members' ) {
-    $RT::Logger->error("'$Type' is incorrect type of ticket graph");
-    $Type = 'Links';
-}
 $ARGS{'Depth'} = 3 unless defined $ARGS{'Depth'} && length $ARGS{'Depth'};
-
-my $title;
-if ( $Type eq 'Links' ) {
-    $title = loc( "Ticket #[_1] full relationships graph", $id );
-} else {
-    $title = loc( "Ticket #[_1] relationships graph", $id );
-}
 </%INIT>

Modified: rt/branches/3.8-TESTING/html/Ticket/History.html
==============================================================================
--- rt/branches/3.8-TESTING/html/Ticket/History.html	(original)
+++ rt/branches/3.8-TESTING/html/Ticket/History.html	Tue Apr 22 15:34:51 2008
@@ -50,7 +50,7 @@
     Ticket => $Ticket, current_tab => 'Ticket/History.html?id='.$Ticket->id, 
     Title => loc("Ticket History # [_1] [_2]", $Ticket->Id, $Ticket->Subject) &>
 
-% $m->callback(CallbackName => 'BeforeActionList', ARGSRef => \%ARGS, Ticket => $Ticket);
+% $m->callback( %ARGS, Ticket => $Ticket, CallbackName => 'BeforeActionList' );
 
 
 <br />
@@ -63,8 +63,7 @@
     AttachmentContent => $attachment_content
     &> 
 
-<& /Elements/Callback, _CallbackName => 'AfterShowHistory', Ticket => $Ticket, 
-current_tab => 'Ticket/History.html?id=' . $Ticket->id, %ARGS &>
+% $m->callback( %ARGS, CallbackName => 'AfterShowHistory', Ticket => $Ticket, current_tab => 'Ticket/History.html?id=' . $Ticket->id );
 
 <%ARGS>
 $id => undef

Modified: rt/branches/3.8-TESTING/html/Ticket/ModifyLinks.html
==============================================================================
--- rt/branches/3.8-TESTING/html/Ticket/ModifyLinks.html	(original)
+++ rt/branches/3.8-TESTING/html/Ticket/ModifyLinks.html	Tue Apr 22 15:34:51 2008
@@ -57,7 +57,9 @@
 <form action="ModifyLinks.html" method="post">
 <input type="hidden" class="hidden" name="id" value="<%$Ticket->id%>" />
 % $m->callback( CallbackName => 'FormStart', ARGSRef => \%ARGS );
-<&| /Widgets/TitleBox, title => loc('Edit Links'), class=>'ticket-info-links' &>
+% my (@extra);
+% push @extra, titleright_raw => '<a href="'. $RT::WebPath. '/Ticket/Graphs/index.html?id='.$Ticket->id.'">'.loc('Graph').'</a>' unless $RT::DisableGraphViz;
+<&| /Widgets/TitleBox, title => loc('Edit Links'), class=>'ticket-info-links', @extra &>
 <& /Elements/EditLinks, Object => $Ticket, Merge => 1 &>
 </&>
 <& /Elements/Submit, Label => loc('Save Changes') &>

Modified: rt/branches/3.8-TESTING/lib/RT/Graph/Tickets.pm
==============================================================================
--- rt/branches/3.8-TESTING/lib/RT/Graph/Tickets.pm	(original)
+++ rt/branches/3.8-TESTING/lib/RT/Graph/Tickets.pm	Tue Apr 22 15:34:51 2008
@@ -75,7 +75,8 @@
     RefersTo  => { style => 'dotted', constraint => 'false' },
 );
 
-my @fill_colors = qw(
+# We don't use qw() because perl complains about "possible attempt to put comments in qw() list"
+my @fill_colors = split ' ',<<EOT;
     #0000FF #8A2BE2 #A52A2A #DEB887 #5F9EA0 #7FFF00 #D2691E #FF7F50
     #6495ED #FFF8DC #DC143C #00FFFF #00008B #008B8B #B8860B #A9A9A9
     #A9A9A9 #006400 #BDB76B #8B008B #556B2F #FF8C00 #9932CC #8B0000
@@ -93,7 +94,7 @@
     #4169E1 #8B4513 #FA8072 #F4A460 #2E8B57 #FFF5EE #A0522D #C0C0C0
     #87CEEB #6A5ACD #708090 #708090 #FFFAFA #00FF7F #4682B4 #D2B48C
     #008080 #D8BFD8 #FF6347 #40E0D0 #EE82EE #F5DEB3 #FFFF00 #9ACD32
-);
+EOT
 
 sub gv_escape($) {
     my $value = shift;
@@ -103,58 +104,6 @@
 
 our (%fill_cache, @available_colors) = ();
 
-sub TicketMembers {
-    my $self = shift;
-    my %args = (
-        Ticket       => undef,
-        Graph        => undef,
-        Seen         => undef,
-        Depth        => 0,
-        CurrentDepth => 1,
-        @_
-    );
-    unless ( $args{'Graph'} ) {
-        $args{'Graph'} = GraphViz->new(
-            name    => "ticket_members_". $args{'Ticket'}->id,
-            bgcolor => "transparent",
-            node    => { shape => 'box', style => 'rounded,filled', fillcolor => 'white' },
-        );
-        %fill_cache = ();
-        @available_colors = @fill_colors;
-    }
-
-    $self->AddTicket( %args );
-
-    $args{'Seen'} ||= {};
-    return $args{'Graph'} if $args{'Seen'}{ $args{'Ticket'}->id }++;
-
-    return $args{'Graph'} if $args{'Depth'} && $args{'CurrentDepth'} >= $args{'Depth'};
-
-    my $show_link_descriptions = $args{'ShowLinkDescriptions'}
-        && RT::Link->can('Description');
-
-    my $to_links = $args{'Ticket'}->Links('Target', 'MemberOf');
-    $to_links->GotoFirstItem;
-    while ( my $link = $to_links->Next ) {
-        my $base = $link->BaseObj;
-        next unless $base->isa('RT::Ticket');
-
-        $self->TicketMembers(
-            %args,
-            Ticket => $base,
-            CurrentDepth => $args{'CurrentDepth'} + 1,
-        );
-
-        my $desc;
-        $desc = $link->Description if $show_link_descriptions;
-        $args{'Graph'}->add_edge(
-            $args{'Ticket'}->id => $base->id,
-            $desc? (label => gv_escape $desc): (),
-        );
-    }
-    return $args{'Graph'};
-};
-
 my %property_cb = (
     Queue => sub { return $_[0]->QueueObj->Name || $_[0]->Queue },
     CF    => sub {

Modified: rt/branches/3.8-TESTING/lib/RT/Interface/Web/Request.pm
==============================================================================
--- rt/branches/3.8-TESTING/lib/RT/Interface/Web/Request.pm	(original)
+++ rt/branches/3.8-TESTING/lib/RT/Interface/Web/Request.pm	Tue Apr 22 15:34:51 2008
@@ -72,7 +72,7 @@
 Method replaces deprecated component C<Element/Callback>.
 
 Takes hash with optional C<CallbackPage>, C<CallbackName>
-and C<CallabckOnce> arguments, other arguments are passed
+and C<CallbackOnce> arguments, other arguments are passed
 throught to callback components.
 
 =over4
@@ -110,7 +110,7 @@
     my $name = delete $args{'CallbackName'} || 'Default';
     my $page = delete $args{'CallbackPage'} || $self->callers(0)->path;
     unless ( $page ) {
-        $RT::Logger->error("Coulnd't get a page name for callbacks");
+        $RT::Logger->error("Couldn't get a page name for callbacks");
         return;
     }
 

Modified: rt/branches/3.8-TESTING/sbin/rt-test-dependencies.in
==============================================================================
--- rt/branches/3.8-TESTING/sbin/rt-test-dependencies.in	(original)
+++ rt/branches/3.8-TESTING/sbin/rt-test-dependencies.in	Tue Apr 22 15:34:51 2008
@@ -68,7 +68,7 @@
     'with-GPG',
     'with-ICAL',
     'with-SMTP',
-    'with-GRAPH',
+    'with-GRAPHVIZ',
 
     'download=s',
     'repository=s',
@@ -91,7 +91,7 @@
     'with-GPG' => 1,
     'with-ICAL' => 1,
     'with-SMTP' => 1,
-    'with-GRAPH' => 1,
+    'with-GRAPHVIZ' => @RT_GRAPHVIZ@,
 );
 $args{$_} = $default{$_} foreach grep !exists $args{$_}, keys %default;
 
@@ -341,7 +341,7 @@
 Net::SMTP
 .
 
-$deps{'GRAPH'} = [ text_to_hash( << '.') ];
+$deps{'GRAPHVIZ'} = [ text_to_hash( << '.') ];
 GraphViz
 IPC::Run
 IPC::Run::SafeHandles


More information about the Rt-commit mailing list