[Rt-commit] r6528 - in rt/branches/3.7-EXPERIMENTAL: . html/Elements/RT__Ticket

ruz at bestpractical.com ruz at bestpractical.com
Sun Nov 26 17:46:54 EST 2006


Author: ruz
Date: Sun Nov 26 17:46:53 2006
New Revision: 6528

Modified:
   rt/branches/3.7-EXPERIMENTAL/   (props changed)
   rt/branches/3.7-EXPERIMENTAL/html/Elements/EditCustomField
   rt/branches/3.7-EXPERIMENTAL/html/Elements/EditLinks
   rt/branches/3.7-EXPERIMENTAL/html/Elements/Error
   rt/branches/3.7-EXPERIMENTAL/html/Elements/Footer
   rt/branches/3.7-EXPERIMENTAL/html/Elements/Header
   rt/branches/3.7-EXPERIMENTAL/html/Elements/ListActions
   rt/branches/3.7-EXPERIMENTAL/html/Elements/Login
   rt/branches/3.7-EXPERIMENTAL/html/Elements/MakeClicky
   rt/branches/3.7-EXPERIMENTAL/html/Elements/MessageBox
   rt/branches/3.7-EXPERIMENTAL/html/Elements/PageLayout
   rt/branches/3.7-EXPERIMENTAL/html/Elements/QueueSummary
   rt/branches/3.7-EXPERIMENTAL/html/Elements/RT__Ticket/ColumnMap
   rt/branches/3.7-EXPERIMENTAL/html/Elements/SelectCustomFieldValue
   rt/branches/3.7-EXPERIMENTAL/html/Elements/ShowLinks
   rt/branches/3.7-EXPERIMENTAL/html/Elements/Tabs

Log:
 r4185 at cubic-pc:  cubic | 2006-11-27 01:50:53 +0300
  r3518 at cubic-pc:  cubic | 2006-06-30 18:45:45 +0400
  * switch $m->rt_callback interface
  
 


Modified: rt/branches/3.7-EXPERIMENTAL/html/Elements/EditCustomField
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Elements/EditCustomField	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Elements/EditCustomField	Sun Nov 26 17:46:53 2006
@@ -75,7 +75,7 @@
 $m->out("\n".'<input type="hidden" class="hidden" name="'.$NamePrefix.$CustomField->Id.'-Values-Magic" value="1" />'."\n");
 
 my $EditComponent = "EditCustomField$Type";
-$m->comp('/Elements/Callback', _CallbackName => 'EditComponentName', Name => \$EditComponent, CustomField => $CustomField, Object => $Object );
+$m->rt_callback( CallbackName => 'EditComponentName', Name => \$EditComponent, CustomField => $CustomField, Object => $Object );
 $EditComponent = "EditCustomField$Type" unless $m->comp_exists($EditComponent);
 
 return $m->comp(

Modified: rt/branches/3.7-EXPERIMENTAL/html/Elements/EditLinks
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Elements/EditLinks	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Elements/EditLinks	Sun Nov 26 17:46:53 2006
@@ -117,7 +117,7 @@
 <h3><&|/l&>New Links</&></h3>
 % if (ref($Object) eq 'RT::Ticket') {
 <i><&|/l&>Enter tickets or URIs to link tickets to. Separate multiple entries with spaces.</&>
-<& /Elements/Callback, _CallbackName => 'ExtraLinkInstructions' &>
+% $m->rt_callback( CallbackName => 'ExtraLinkInstructions' );
 </i><br />
 % } elsif (ref($Object) eq 'RT::Queue') {
 <i><&|/l&>Enter queues or URIs to link queues to. Separate multiple entries with spaces.</&>

Modified: rt/branches/3.7-EXPERIMENTAL/html/Elements/Error
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Elements/Error	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Elements/Error	Sun Nov 26 17:46:53 2006
@@ -43,7 +43,7 @@
 %# those contributions and any derivatives thereof.
 %# 
 %# END BPS TAGGED BLOCK }}}
-<& /Elements/Callback, %ARGS, error => $error &>
+% $m->rt_callback( %ARGS, error => $error );
 <& /Elements/Header, Code => $Code, Why => $Why, Title => $Title &>
 <& /Elements/Tabs, Title => $Title &>
 <div class="error">

Modified: rt/branches/3.7-EXPERIMENTAL/html/Elements/Footer
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Elements/Footer	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Elements/Footer	Sun Nov 26 17:46:53 2006
@@ -46,7 +46,7 @@
 
 %# End of div#body from /Elements/PageLayout
 </div>
-<& /Elements/Callback, %ARGS &>
+% $m->rt_callback( %ARGS );
 <div id="footer">
   <p id="time">
     <span><&|/l&>Time to display</&>: <%Time::HiRes::tv_interval( $m->{'rt_base_time'} )%></span>

Modified: rt/branches/3.7-EXPERIMENTAL/html/Elements/Header
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Elements/Header	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Elements/Header	Sun Nov 26 17:46:53 2006
@@ -76,7 +76,7 @@
 % }
 --></script>
 
-<& /Elements/Callback, _CallbackName => 'Head', %ARGS &>
+% $m->rt_callback( %ARGS, CallbackName => 'Head' );
 
 </head>
   <body<% $id && qq[ id="comp-$id"] |n %>>
@@ -95,7 +95,7 @@
 % } else {
     <&|/l&>Not logged in.</&>
 % }
-  <& /Elements/Callback, %ARGS &>
+% $m->rt_callback( %ARGS );
 % unless (!$session{'CurrentUser'}->Name
 %         or (RT->Config->Get('WebExternalAuth') and !RT->Config->Get('WebFallbackToInternalAuth'))) {
     | <a  href="<%RT->Config->Get('WebPath')%>/NoAuth/Logout.html<%$URL ? "?URL=".$URL : ''%>"><&|/l&>Logout</&></a>

Modified: rt/branches/3.7-EXPERIMENTAL/html/Elements/ListActions
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Elements/ListActions	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Elements/ListActions	Sun Nov 26 17:46:53 2006
@@ -51,15 +51,16 @@
   </ul>
 </&>
 <%init>
+# XXX: run callbacks per row really crazy idea
 @actions =
     grep $_,
     grep {
         my $skip;
-        $m->comp('/Elements/Callback',
-            _CallbackName => 'ModifyRow',
-            row => \$_,
+        $m->rt_callback(
+            %ARGS,
+            row  => \$_,
             skip => \$skip,
-            %ARGS
+            CallbackName => 'ModifyRow',
         );
         !$skip;
     }

Modified: rt/branches/3.7-EXPERIMENTAL/html/Elements/Login
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Elements/Login	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Elements/Login	Sun Nov 26 17:46:53 2006
@@ -64,7 +64,7 @@
                 ;
 </%INIT>
 
-<& /Elements/Callback, %ARGS, _CallbackName => 'Header' &>
+% $m->rt_callback( %ARGS, CallbackName => 'Header' );
 <& /Elements/Header, Title => loc('Login'), Focus => 'user' &>
 
 
@@ -79,7 +79,7 @@
 </&>
 % }
 
-<& /Elements/Callback, %ARGS, _CallbackName => 'BeforeForm' &>
+% $m->rt_callback( %ARGS, CallbackName => 'BeforeForm' );
 
 <div id="login-box">
 <&| /Widgets/TitleBox, title => loc('Login'), titleright => $RT::VERSION, hideable => 0 &>
@@ -102,7 +102,7 @@
 </div>
 
 %# Give callbacks a chance to add more control elements
-<& /Elements/Callback, %ARGS &>
+% $m->rt_callback( %ARGS );
 
 % # From mason 1.0.1 forward, this doesn't work. in fact, it breaks things.
 % # But on Mason 1.15 it's fixed again, so we still use it.
@@ -127,7 +127,7 @@
 % }
 </&>
 </div><!-- #login-box -->
-<& /Elements/Callback, %ARGS, _CallbackName => 'AfterForm' &>
+% $m->rt_callback( %ARGS, CallbackName => 'AfterForm' );
 <& /Elements/Footer, Menu => 0 &>
 <%ARGS>
 $user => ""

Modified: rt/branches/3.7-EXPERIMENTAL/html/Elements/MakeClicky
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Elements/MakeClicky	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Elements/MakeClicky	Sun Nov 26 17:46:53 2006
@@ -49,10 +49,12 @@
 
 # Hook to add more Clicky types
 # XXX Have to have Page argument, as Mason gets caller wrong in Callback?
-$m->comp("/Elements/Callback", Page => "/Elements/MakeClicky",
-    types => \@types,
-    actions => \%actions,
-    handle => \$handle
+# This happens as we are in <%ONCE> block
+$m->rt_callback(
+    CallbackPage => "/Elements/MakeClicky",
+    types        => \@types,
+    actions      => \%actions,
+    handle       => \$handle,
 );
 
 

Modified: rt/branches/3.7-EXPERIMENTAL/html/Elements/MessageBox
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Elements/MessageBox	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Elements/MessageBox	Sun Nov 26 17:46:53 2006
@@ -43,7 +43,9 @@
 %# those contributions and any derivatives thereof.
 %# 
 %# END BPS TAGGED BLOCK }}}
-<textarea class="messagebox" cols="<% $Width %>" rows="<% $Height %>" wrap="<% $Wrap %>" name="<% $Name %>"><& /Elements/Callback, %ARGS &><% $Default || '' %><% $message %><% $signature %></textarea>
+<textarea class="messagebox" cols="<% $Width %>" rows="<% $Height %>" wrap="<% $Wrap %>" name="<% $Name %>">\
+% $m->rt_callback( %ARGS );
+<% $Default || '' %><% $message %><% $signature %></textarea>
 <%INIT>
 
 my $message = '';
@@ -69,4 +71,3 @@
 $Wrap             => RT->Config->Get('MessageBoxWrap') || 'HARD'
 $IncludeSignature => 1
 </%ARGS>
-

Modified: rt/branches/3.7-EXPERIMENTAL/html/Elements/PageLayout
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Elements/PageLayout	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Elements/PageLayout	Sun Nov 26 17:46:53 2006
@@ -155,8 +155,8 @@
 </div>
 
 <div id="body">
-<& /Elements/Callback, _CallbackName => 'BeforeBody',  %ARGS &>
-%$m->flush_buffer(); # we've got the page laid out, let's flush the buffer;
+% $m->rt_callback( %ARGS, CallbackName => 'BeforeBody' );
+% $m->flush_buffer(); # we've got the page laid out, let's flush the buffer;
 
 <%INIT>
 if ( defined $current_toptab ) {

Modified: rt/branches/3.7-EXPERIMENTAL/html/Elements/QueueSummary
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Elements/QueueSummary	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Elements/QueueSummary	Sun Nov 26 17:46:53 2006
@@ -75,7 +75,7 @@
     $Queues->UnLimit();
     @queues = grep $queue_filter->($_), @{$Queues->ItemsArrayRef};
 
-    $m->comp('/Elements/Callback', _CallbackName => 'Filter', Queues => \@queues );
+    $m->rt_callback( CallbackName => 'Filter', Queues => \@queues );
 
     @queues = map { {
         id          => $_->Id,

Modified: rt/branches/3.7-EXPERIMENTAL/html/Elements/RT__Ticket/ColumnMap
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Elements/RT__Ticket/ColumnMap	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Elements/RT__Ticket/ColumnMap	Sun Nov 26 17:46:53 2006
@@ -313,6 +313,6 @@
 };
 </%ONCE>
 <%init>
-$m->comp( '/Elements/Callback', COLUMN_MAP    => $COLUMN_MAP, _CallbackName => 'ColumnMap');
+$m->rt_callback( COLUMN_MAP => $COLUMN_MAP, CallbackName => 'ColumnMap', CallbackOnce => 1 );
 return ColumnMap($Name, $Attr);
 </%init>

Modified: rt/branches/3.7-EXPERIMENTAL/html/Elements/SelectCustomFieldValue
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Elements/SelectCustomFieldValue	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Elements/SelectCustomFieldValue	Sun Nov 26 17:46:53 2006
@@ -43,7 +43,7 @@
 %# those contributions and any derivatives thereof.
 %# 
 %# END BPS TAGGED BLOCK }}}
-<& /Elements/Callback, %ARGS &>
+% $m->rt_callback( Name => $Name, CustomField => $CustomField );
 % if ($CustomField->Type =~ /Select/i) {
 % my $values = $CustomField->Values;
 <select name="<%$Name%>">

Modified: rt/branches/3.7-EXPERIMENTAL/html/Elements/ShowLinks
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Elements/ShowLinks	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Elements/ShowLinks	Sun Nov 26 17:46:53 2006
@@ -101,7 +101,7 @@
   </tr>
 
 % # Allow people to add more rows to the table                                                                                                                           
-%  $m->comp('/Elements/Callback', %ARGS );
+% $m->rt_callback( %ARGS );
 
 </table>
 

Modified: rt/branches/3.7-EXPERIMENTAL/html/Elements/Tabs
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Elements/Tabs	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Elements/Tabs	Sun Nov 26 17:46:53 2006
@@ -100,10 +100,12 @@
    $topactions = $basetopactions;
 }
                     
-  # Now let callbacks add their extra tabs
-  $m->comp('/Elements/Callback', 
+# Now let callbacks add their extra tabs
+$m->rt_callback(
     topactions => $topactions, 
-    toptabs => $toptabs, %ARGS);
+    toptabs    => $toptabs,
+    %ARGS
+);
 
 </%INIT>
 <%ARGS>


More information about the Rt-commit mailing list