[Rt-commit] r8155 - in rt/branches/3.7-EXPERIMENTAL-TUNIS/html: .
Admin/Queues Elements REST/1.0/NoAuth Search/Elements Ticket
Tools User
ruz at bestpractical.com
ruz at bestpractical.com
Thu Jul 12 23:50:24 EDT 2007
Author: ruz
Date: Thu Jul 12 23:50:24 2007
New Revision: 8155
Modified:
rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Admin/Queues/Modify.html
rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Elements/ShowSearch
rt/branches/3.7-EXPERIMENTAL-TUNIS/html/REST/1.0/NoAuth/mail-gateway
rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Search/Elements/PickCFs
rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Ticket/Display.html
rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Tools/Offline.html
rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Tools/Reports/index.html
rt/branches/3.7-EXPERIMENTAL-TUNIS/html/User/Prefs.html
rt/branches/3.7-EXPERIMENTAL-TUNIS/html/autohandler
Log:
* switch to new callbacks API
Modified: rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Admin/Queues/Modify.html
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Admin/Queues/Modify.html (original)
+++ rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Admin/Queues/Modify.html Thu Jul 12 23:50:24 2007
@@ -160,10 +160,11 @@
$EnabledChecked = "" if $QueueObj->Disabled;
my @linkresults;
- $m->comp('/Elements/Callback',
- results => \@linkresults,
- RecordObj => $QueueObj, ARGSRef => \%ARGS,
- _CallbackName => 'ProcessLinks'
+ $m->callback(
+ results => \@linkresults,
+ RecordObj => $QueueObj,
+ ARGSRef => \%ARGS,
+ CallbackName => 'ProcessLinks'
);
push @results, @linkresults;
}
Modified: rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Elements/ShowSearch
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Elements/ShowSearch (original)
+++ rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Elements/ShowSearch Thu Jul 12 23:50:24 2007
@@ -103,9 +103,9 @@
my $ProcessedSearchArg = $SearchArg;
$ProcessedSearchArg = { %$SearchArg, %Override } if keys %Override;
-$m->comp(
- '/Elements/Callback', %ARGS,
- _CallbackName => 'ModifySearch',
+$m->callback(
+ %ARGS,
+ CallbackName => 'ModifySearch',
OriginalSearch => $SearchArg,
Search => $ProcessedSearchArg,
);
Modified: rt/branches/3.7-EXPERIMENTAL-TUNIS/html/REST/1.0/NoAuth/mail-gateway
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-TUNIS/html/REST/1.0/NoAuth/mail-gateway (original)
+++ rt/branches/3.7-EXPERIMENTAL-TUNIS/html/REST/1.0/NoAuth/mail-gateway Thu Jul 12 23:50:24 2007
@@ -54,7 +54,7 @@
$ticket => undef
</%ARGS>
<%init>
-$m->comp('/Elements/Callback', _CallbackName => 'Pre', %ARGS);
+$m->callback( %ARGS, CallbackName => 'Pre' );
use RT::Interface::Email (); # It's an exporter, but we don't care
$r->content_type('text/plain; charset=utf-8');
$m->error_format('text');
Modified: rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Search/Elements/PickCFs
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Search/Elements/PickCFs (original)
+++ rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Search/Elements/PickCFs Thu Jul 12 23:50:24 2007
@@ -62,9 +62,11 @@
}
$CustomFields->LimitToQueue($queue->Id);
}
-$CustomFields->LimitToGlobal();
- $m->comp('/Elements/Callback', _CallbackName => 'MassageCustomFields',
- CustomFields => $CustomFields);
+$CustomFields->LimitToGlobal;
+$m->callback(
+ CallbackName => 'MassageCustomFields',
+ CustomFields => $CustomFields,
+);
my @lines;
Modified: rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Ticket/Display.html
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Ticket/Display.html (original)
+++ rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Ticket/Display.html Thu Jul 12 23:50:24 2007
@@ -117,9 +117,9 @@
} else {
$TicketObj ||= LoadTicket($ARGS{'id'});
- $m->comp('/Elements/Callback', _CallbackName => 'BeforeProcessArguments',
- TicketObj => $TicketObj, Tickets => $Tickets,
- ActionsRef => \@Actions, ARGSRef => \%ARGS);
+ $m->callback( CallbackName => 'BeforeProcessArguments',
+ TicketObj => $TicketObj, Tickets => $Tickets,
+ ActionsRef => \@Actions, ARGSRef => \%ARGS );
if ( defined $ARGS{'Action'} ) {
if ($ARGS{'Action'} =~ /^(Steal|Kill|Take|SetTold)$/) {
my $action = $1;
Modified: rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Tools/Offline.html
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Tools/Offline.html (original)
+++ rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Tools/Offline.html Thu Jul 12 23:50:24 2007
@@ -52,8 +52,7 @@
<& /Elements/ListActions, actions => \@results &>
-<& /Elements/Callback, Requestor => \$requestoraddress,
- Queue => \$qname, %ARGS &>
+% $m->callback( Requestor => \$requestoraddress, Queue => \$qname, %ARGS );
<form action="Offline.html" name="TicketUpdate"
method="post" enctype="multipart/form-data">
Modified: rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Tools/Reports/index.html
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Tools/Reports/index.html (original)
+++ rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Tools/Reports/index.html Thu Jul 12 23:50:24 2007
@@ -47,4 +47,4 @@
%# END BPS TAGGED BLOCK }}}
<& /Elements/Header, Title => loc('Reports') &>
<& /Tools/Reports/Elements/Tabs, Title => loc('Reports') &>
-<& /Elements/Callback &>
+% $m->callback;
Modified: rt/branches/3.7-EXPERIMENTAL-TUNIS/html/User/Prefs.html
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-TUNIS/html/User/Prefs.html (original)
+++ rt/branches/3.7-EXPERIMENTAL-TUNIS/html/User/Prefs.html Thu Jul 12 23:50:24 2007
@@ -178,7 +178,7 @@
</tr>
</table>
-<& /Elements/Callback, _CallbackName => 'FormEnd', UserObj => $UserObj, %ARGS &>
+% $m->callback( %ARGS, UserObj => $UserObj, CallbackName => 'FormEnd' );
<& /Elements/Submit, Label => loc('Save Preferences') &>
</form>
@@ -210,11 +210,13 @@
Address2 City State Zip Country Lang
);
- $m->comp('/Elements/Callback', _CallbackName => 'UpdateLogic',
- fields => \@fields,
- results => \@results,
- UserObj => $UserObj,
- ARGSRef => \%ARGS);
+ $m->callback(
+ CallbackName => 'UpdateLogic',
+ fields => \@fields,
+ results => \@results,
+ UserObj => $UserObj,
+ ARGSRef => \%ARGS,
+ );
my @fieldresults = UpdateRecordObject ( AttributesRef => \@fields,
Object => $UserObj,
Modified: rt/branches/3.7-EXPERIMENTAL-TUNIS/html/autohandler
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-TUNIS/html/autohandler (original)
+++ rt/branches/3.7-EXPERIMENTAL-TUNIS/html/autohandler Thu Jul 12 23:50:24 2007
@@ -193,8 +193,7 @@
'Zip', 'Country'
)
{
- $m->comp( '/Elements/Callback', %ARGS,
- _CallbackName => 'NewUser' );
+ $m->callback( %ARGS, CallbackName => 'NewUser' );
my $method = "Set$attribute";
$UserObj->$method( $new_user_info->{$attribute} )
@@ -259,13 +258,13 @@
$m->comp( '/Elements/Login', %ARGS,
Error => loc('Your username or password is incorrect'),
);
- $m->comp( '/Elements/Callback', %ARGS, _CallbackName => 'FailedLogin' );
+ $m->callback( %ARGS, CallbackName => 'FailedLogin' );
$m->abort;
}
$session{'CurrentUser'} = $user_obj;
$RT::Logger->info(
"Successful login for $user from $ENV{'REMOTE_ADDR'}");
- $m->comp( '/Elements/Callback', %ARGS, _CallbackName => 'SuccessfulLogin' );
+ $m->callback( %ARGS, CallbackName => 'SuccessfulLogin' );
}
# if no credentials then show him login page
else {
More information about the Rt-commit
mailing list