[Rt-commit] r8584 - in rtir/branches/2.3-EXPERIMENTAL: . html/RTIR
thayes at bestpractical.com
thayes at bestpractical.com
Thu Aug 16 15:04:48 EDT 2007
Author: thayes
Date: Thu Aug 16 15:04:46 2007
New Revision: 8584
Modified:
rtir/branches/2.3-EXPERIMENTAL/ (props changed)
rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Create.html
rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Display.html
rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Edit.html
rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Incident/Create.html
rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Incident/Display.html
rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Incident/Edit.html
rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Incident/LinkToIncident.html
rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Incident/Reply.html
rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Merge.html
rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Update.html
Log:
r8814 at toth: toth | 2007-08-16 15:04:32 -0400
* Modified to use more general callback names
Modified: rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Create.html
==============================================================================
--- rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Create.html (original)
+++ rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Create.html Thu Aug 16 15:04:46 2007
@@ -47,7 +47,7 @@
&>
% }
-% $m->callback(CallbackName => 'ShowLock', %ARGS, Ticket => $TicketObj);
+% $m->callback(CallbackName => 'BeforeActionList', %ARGS, Ticket => $TicketObj);
<& /Elements/ListActions, actions => \@results &>
% if ( $Split && !$TicketObj->CurrentUserHasRight('ModifyTicket') ) {
Modified: rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Display.html
==============================================================================
--- rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Display.html (original)
+++ rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Display.html Thu Aug 16 15:04:46 2007
@@ -30,7 +30,7 @@
current_subtab => 'RTIR/Display.html?id='.$Ticket->id,
Title => $Title &>
-% $m->callback(CallbackName => 'ShowLock', %ARGS, Ticket => $Ticket);
+% $m->callback(CallbackName => 'BeforeActionList', %ARGS, Ticket => $Ticket);
<& /Elements/ListActions, actions => \@results &>
<table border="0" cellpadding="0" cellspacing="2" width="100%">
<tr>
@@ -238,6 +238,11 @@
($Ticket, @results) = CreateTicket( %ARGS, Attachments => delete $session{'Attachments'} );
} elsif( $id ) {
my $oldstate = $Ticket->FirstCustomFieldValue('_RTIR_State') ||'';
+
+$m->callback(CallbackName => 'ProcessArguments',
+ Ticket => $Ticket,
+ ARGSref => \%ARGS,
+ Actions => \@results);
if ( $ARGS{'Action'} && $ARGS{'Action'} =~ /^(Steal|Kill|Take|SetTold)$/ ) {
my $action = $1;
@@ -260,10 +265,7 @@
$m->callback(CallbackName => 'TicketTakeOrSteal', %ARGS, Ticket => $Ticket, Type => $Type, Results => \@results);
}
}
- $m->callback(CallbackName => 'ProcessLockArgument',
- Ticket => $Ticket,
- ARGSref => \%ARGS,
- Actions => \@results);
+
$ARGS{UpdateAttachments} = delete $session{'Attachments'};
Modified: rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Edit.html
==============================================================================
--- rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Edit.html (original)
+++ rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Edit.html Thu Aug 16 15:04:46 2007
@@ -29,7 +29,7 @@
current_subtab => "RTIR/Edit.html?id=".$Ticket->Id,
Title => $Title &>
-% $m->callback(CallbackName => 'ShowLock', Ticket => $Ticket);
+% $m->callback(CallbackName => 'BeforeActionList', Ticket => $Ticket);
<& /Elements/ListActions, actions => \@results &>
% if (!$Ticket->CurrentUserHasRight('ModifyTicket')) {
Modified: rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Incident/Create.html
==============================================================================
--- rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Incident/Create.html (original)
+++ rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Incident/Create.html Thu Aug 16 15:04:46 2007
@@ -30,7 +30,7 @@
Ticket => $TicketObj &>
-% $m->callback(CallbackName => 'ShowLock', %ARGS, Ticket => $TicketObj);
+% $m->callback(CallbackName => 'BeforeActionList', %ARGS, Ticket => $TicketObj);
<& /Elements/ListActions, actions => \@results &>
<%PERL>
@@ -290,7 +290,7 @@
}
}
if( $inc_obj ) {
- $m->callback(CallbackName => 'BeforeDisplayIncident', ARGSref => \%ARGS, Child => $ChildObj);
+ $m->callback(CallbackName => 'BeforeDisplay', ARGSref => \%ARGS, Child => $ChildObj);
return $m->comp('Display.html', %ARGS, id => $inc_obj->id, results => \@results );
}
Modified: rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Incident/Display.html
==============================================================================
--- rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Incident/Display.html (original)
+++ rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Incident/Display.html Thu Aug 16 15:04:46 2007
@@ -30,7 +30,7 @@
current_subtab => 'RTIR/Display.html?id='.$id,
Title => loc("Incident #[_1]: [_2]", $id, $TicketObj->Subject) &>
-% $m->callback(CallbackName => 'ShowLock', %ARGS, Ticket => $TicketObj);
+% $m->callback(CallbackName => 'BeforeActionList', %ARGS, Ticket => $TicketObj);
<& /Elements/ListActions, actions => \@results &>
<table border="0" cellpadding="0" cellspacing="2" width="100%"><tr><td valign="top" width="50%">
@@ -323,6 +323,11 @@
$TicketObj = LoadTicket( $id );
}
+$m->callback(CallbackName => 'ProcessArguments',
+ Ticket => $TicketObj,
+ ARGSref => \%ARGS,
+ Actions => \@results);
+
unless( $TicketObj->QueueObj->Name eq 'Incidents' ) {
return $m->comp('/RTIR/Display.html', %ARGS );
}
@@ -340,10 +345,7 @@
if ($res && $action =~ /^(?:Take|Steal)$/) { $ARGS{'Lock'} = 'add'; }
}
- $m->callback(CallbackName => 'ProcessLockArgument',
- Ticket => $TicketObj,
- ARGSref => \%ARGS,
- Actions => \@results);
+
unless( $new_ticket ) {
Modified: rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Incident/Edit.html
==============================================================================
--- rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Incident/Edit.html (original)
+++ rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Incident/Edit.html Thu Aug 16 15:04:46 2007
@@ -30,7 +30,7 @@
Title => loc("Edit Incident #[_1]: [_2]",
$Ticket->Id, $Ticket->Subject) &>
-% $m->callback(CallbackName => 'ShowLock', Ticket => $Ticket);
+% $m->callback(CallbackName => 'BeforeActionList', Ticket => $Ticket);
<& /Elements/ListActions, actions => \@results &>
% unless ( $Ticket->CurrentUserHasRight('ModifyTicket') ) {
Modified: rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Incident/LinkToIncident.html
==============================================================================
--- rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Incident/LinkToIncident.html (original)
+++ rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Incident/LinkToIncident.html Thu Aug 16 15:04:46 2007
@@ -38,7 +38,7 @@
current_subtab => "RTIR/Search/Refine.html",
&>
-% $m->callback(CallbackName => 'ShowLock', Ticket => $ChildObj);
+% $m->callback(CallbackName => 'BeforeActionList', Ticket => $ChildObj);
<form action="<% RT->Config->Get('WebPath') %>/RTIR/Incident/Display.html" method="post">
<input type="hidden" name="Child" value="<% $id %>" />
Modified: rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Incident/Reply.html
==============================================================================
--- rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Incident/Reply.html (original)
+++ rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Incident/Reply.html Thu Aug 16 15:04:46 2007
@@ -35,7 +35,7 @@
current_subtab => "RTIR/Search/Refine.html",
&>
-% $m->callback(CallbackName => 'ShowLock', Ticket => $IncidentObj);
+% $m->callback(CallbackName => 'BeforeActionList', Ticket => $IncidentObj);
<& /Elements/ListActions, actions => \@results &>
<form action="Reply.html" method="get">
Modified: rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Merge.html
==============================================================================
--- rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Merge.html (original)
+++ rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Merge.html Thu Aug 16 15:04:46 2007
@@ -35,7 +35,7 @@
current_subtab => 'RTIR/Search/Refine.html',
&>
-% $m->callback(CallbackName => 'ShowLock', Ticket => $Ticket);
+% $m->callback(CallbackName => 'BeforeActionList', Ticket => $Ticket);
<& /Elements/ListActions, actions => \@results &>
Modified: rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Update.html
==============================================================================
--- rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Update.html (original)
+++ rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Update.html Thu Aug 16 15:04:46 2007
@@ -29,7 +29,7 @@
Title => $title &>
-% $m->callback(CallbackName => 'ShowLock', Ticket => $Ticket);
+% $m->callback(CallbackName => 'BeforeActionList', Ticket => $Ticket);
<form action="Update.html" name="TicketUpdate"
method="post" enctype="multipart/form-data">
<input type="hidden" name="QuoteTransaction" value="<% $ARGS{'QuoteTransaction'} || '' %>" />
More information about the Rt-commit
mailing list