Mailing List Archive

Author: leira
Date: Thu Sep 2 19:16:02 2004
New Revision: 1409

Modified:
rtir/branches/1.1/html/RTIR/Elements/NewReports
rtir/branches/1.1/html/RTIR/Elements/QueueTabs
rtir/branches/1.1/html/RTIR/Elements/ShowIncidents
rtir/branches/1.1/html/RTIR/Incident/LinkToIncident.html
rtir/branches/1.1/html/RTIR/Search/LinkRefine.html
Log:
Call the argument for LinkToIncidents "id" rather than "child" -- the non-standardness is getting in the way of merging some pages into one.


Modified: rtir/branches/1.1/html/RTIR/Elements/NewReports
==============================================================================
--- rtir/branches/1.1/html/RTIR/Elements/NewReports (original)
+++ rtir/branches/1.1/html/RTIR/Elements/NewReports Thu Sep 2 19:16:02 2004
@@ -62,7 +62,7 @@
</TD>
<TD ALIGN=RIGHT>
% if ($Ticket->Owner == $session{CurrentUser}->id) {
-[<A HREF="<% $RT::WebPath %>/RTIR/Incident/LinkToIncident.html?ClearRestrictions=1&child=<%$Ticket->Id%>"><&|/l&>Link</&></A>]
+[<A HREF="<% $RT::WebPath %>/RTIR/Incident/LinkToIncident.html?ClearRestrictions=1&id=<%$Ticket->Id%>"><&|/l&>Link</&></A>]
[<A HREF="<% $RT::WebPath %>/RTIR/Update.html?id=<%$Ticket->Id%>"><&|/l&>Update</&></A>]
% } elsif ($Ticket->Owner == $RT::Nobody->Id) {
[<A HREF="<% $RT::WebPath %>/RTIR/Display.html?Action=Take&id=<%$Ticket->Id%>"><&|/l&>Take</&></A>]

Modified: rtir/branches/1.1/html/RTIR/Elements/QueueTabs
==============================================================================
--- rtir/branches/1.1/html/RTIR/Elements/QueueTabs (original)
+++ rtir/branches/1.1/html/RTIR/Elements/QueueTabs Thu Sep 2 19:16:02 2004
@@ -33,10 +33,6 @@
QueryString => $QueryString,
&>

-current_toptab: <% $current_toptab %><br>
-current_tab: <% $current_tab %><br>
-current_subtab: <% $current_subtab %><br>
-
<%INIT>

my ($Type, undef) = $m->comp('/RTIR/Elements/Type', Queue => $QueueName);
@@ -235,7 +231,7 @@
my ($childtype, undef) = $m->comp('/RTIR/Elements/Type', Queue => $childq);

$tabs->{'h'} = { title => loc('Link [_1] #[_2]', $childtype, $ChildObj->Id),
- path => "RTIR/Incident/LinkToIncident.html?child=" . $ChildObj->Id,
+ path => "RTIR/Incident/LinkToIncident.html?id=" . $ChildObj->Id,
separator => 1 };

if ( $tabs->{'h'}->{'path'} eq $current_tab ) {

Modified: rtir/branches/1.1/html/RTIR/Elements/ShowIncidents
==============================================================================
--- rtir/branches/1.1/html/RTIR/Elements/ShowIncidents (original)
+++ rtir/branches/1.1/html/RTIR/Elements/ShowIncidents Thu Sep 2 19:16:02 2004
@@ -39,7 +39,7 @@

% if ($depth == 1) {
% if ($Ticket->Owner == $session{'CurrentUser'}->id) {
-<a href="<%$RT::WebPath%>/RTIR/Incident/LinkToIncident.html?child=<%$Ticket->Id%>&ClearRestrictions=1">
+<a href="<%$RT::WebPath%>/RTIR/Incident/LinkToIncident.html?id=<%$Ticket->Id%>&ClearRestrictions=1">
<b>[Link]</b></a>
<a href="<%$RT::WebPath%>/RTIR/Create.html?child=<%$Ticket->Id%>&Queue=Incidents">
<b>[New]</b></a>

Modified: rtir/branches/1.1/html/RTIR/Incident/LinkToIncident.html
==============================================================================
--- rtir/branches/1.1/html/RTIR/Incident/LinkToIncident.html (original)
+++ rtir/branches/1.1/html/RTIR/Incident/LinkToIncident.html Thu Sep 2 19:16:02 2004
@@ -27,8 +27,8 @@
Refresh => $session{'tickets_refresh_interval'} &>

<& '/RTIR/Search/Elements/RefineTabs',
- path => "RTIR/Search/LinkRefine.html?Queue=Incidents&child=$child$QueryString",
- current_tab => "RTIR/Incident/LinkToIncident.html?child=$child",
+ path => "RTIR/Search/LinkRefine.html?Queue=Incidents&id=$id$QueryString",
+ current_tab => "RTIR/Incident/LinkToIncident.html?id=$id",
ChildObj => $ChildObj,
Queue => 'Incidents',
Title => $title,
@@ -41,7 +41,7 @@
&>

<form action='Display.html' method=get>
-<input type=hidden name=child value=<%$child%>>
+<input type=hidden name=child value=<%$id%>>

<& /RTIR/Search/Elements/ShowResults,
Queue => $Queue,
@@ -56,14 +56,12 @@
<HR>

<%INIT>
-$child = $ARGS{'id'} if !$child;
-
$Format = $RT::RTIRLinkIncidentSearchResultFormat;
$ARGS{'Format'} = $Format;

my ($Type, undef) = $m->comp('/RTIR/Elements/Type', Queue => 'Incidents');

-my $ChildObj = LoadTicket($child);
+my $ChildObj = LoadTicket($id);
my $Queue = $ChildObj->QueueObj->Name;

my $SubmitCaption = loc("Link #[_1] with selected Incident", $ChildObj->id);
@@ -71,7 +69,7 @@
my $QueueObj = new RT::Queue($session{'CurrentUser'});
$QueueObj->Load('Incidents') || Abort(loc("Queue could not be loaded."));

-my $title = loc("Link [_1] #[_2] to selected Incident", $Type, $child);
+my $title = loc("Link [_1] #[_2] to selected Incident", $Type, $id);

if (!$Query) {
$Query = $m->comp('/RTIR/Elements/NewQuery', Queue => 'Incidents');
@@ -95,7 +93,7 @@
</%INIT>

<%ARGS>
-$child => undef
+$id => undef
$BaseURL => "/RTIR/Incident/LinkToIncident.html"
$BaseQuery => undef
$Query => undef

Modified: rtir/branches/1.1/html/RTIR/Search/LinkRefine.html
==============================================================================
--- rtir/branches/1.1/html/RTIR/Search/LinkRefine.html (original)
+++ rtir/branches/1.1/html/RTIR/Search/LinkRefine.html Thu Sep 2 19:16:02 2004
@@ -46,9 +46,9 @@
<& /Elements/Header, Title => $title &>

<& '/RTIR/Search/Elements/RefineTabs',
- path => "RTIR/Search/LinkRefine.html?Queue=$Queue&child=".$child,
- current_tab => "RTIR/Incident/LinkToIncident.html?child=".$child,
- current_subtab => "RTIR/Search/LinkRefine.html?Queue=$Queue&child=".$child,
+ path => "RTIR/Search/LinkRefine.html?Queue=$Queue&id=".$id,
+ current_tab => "RTIR/Incident/LinkToIncident.html?id=".$id,
+ current_subtab => "RTIR/Search/LinkRefine.html?Queue=$Queue&id=".$id,
ChildObj => $Ticket,
Queue => 'Incidents',
Title => $title,
@@ -58,7 +58,7 @@
OrderBy => $OrderBy,
Order => $Order,
QueryString => $QueryString,
- child => $child,
+ id => $id,
&>

<& /RTIR/Search/Elements/BuildQuery,
@@ -74,11 +74,10 @@
%ARGS &>

<%INIT>
-$child = $ARGS{'id'} if !$child;
my $title = loc("Query Builder");

my $Ticket = new RT::Ticket($session{'CurrentUser'});
-$Ticket->Load($child);
+$Ticket->Load($id);

my %queues = ();
my $results;
@@ -142,8 +141,6 @@
# }}}

$ARGS{'Query'} = $Query;
-
-$ARGS{'id'} = $child;
</%INIT>

<%ARGS>
@@ -151,7 +148,7 @@
$NewQuery => 0
$Queue => undef
$Query => undef
-$child => undef
+$id => undef
$FormAction => 'LinkRefine.html'
$Format => undef
$HideResults => 0
_______________________________________________
Rt-commit mailing list
Rt-commit@lists.bestpractical.com
http://lists.bestpractical.com/cgi-bin/mailman/listinfo/rt-commit