[Rt-commit] [svn] r1539 - in rtir/branches/1.1-TESTING/html/RTIR: Elements Incident

leira at pallas.eruditorum.org leira at pallas.eruditorum.org
Wed Sep 22 02:10:00 EDT 2004


Author: leira
Date: Wed Sep 22 02:09:59 2004
New Revision: 1539

Removed:
   rtir/branches/1.1-TESTING/html/RTIR/Incident/ShowBlocks.html
   rtir/branches/1.1-TESTING/html/RTIR/Incident/ShowInvestigations.html
   rtir/branches/1.1-TESTING/html/RTIR/Incident/ShowReports.html
Modified:
   rtir/branches/1.1-TESTING/html/RTIR/Elements/ShowChildren
   rtir/branches/1.1-TESTING/html/RTIR/Incident/Display.html
   rtir/branches/1.1-TESTING/html/RTIR/Incident/Reply.html
Log:
RT-Ticket: 6049
RT-Status: resolved
RT-Action: correspond
Consolidate ShowReports/ShowInvestigations/ShowBlocks


Modified: rtir/branches/1.1-TESTING/html/RTIR/Elements/ShowChildren
==============================================================================
--- rtir/branches/1.1-TESTING/html/RTIR/Elements/ShowChildren	(original)
+++ rtir/branches/1.1-TESTING/html/RTIR/Elements/ShowChildren	Wed Sep 22 02:09:59 2004
@@ -32,10 +32,10 @@
 <tr>
   <td>
 % if ($Delete) {
-  <INPUT TYPE=CHECKBOX NAME="DeleteLink-<%$Ticket->Id%>-MemberOf-">
+  <INPUT TYPE=CHECKBOX NAME="DeleteLink-<%$t->Id%>-MemberOf-">
 % }
 % my $State = $m->scomp("/RTIR/Elements/ShowRTIRField", Ticket => $t, Name => 'State');
-  <a href="<%$RT::WebPath%>/RTIR/Display.html?id=<%$t->Id%>&Type=<%$Type%>"><%$t->Id%>: <%$t->Subject%></a> <i>(<%$State%>)</i>
+  <a href="<%$RT::WebPath%>/RTIR/Display.html?id=<%$t->Id%>"><%$t->Id%>: <%$t->Subject%></a> <i>(<%$State%>)</i>
   </td>
   <td align=right>
     <font size="-1"><& ShowDate, date => $t->DueObj &></font>
@@ -51,7 +51,7 @@
   <INPUT TYPE=CHECKBOX NAME="DeleteLink-<%$Ticket->Id%>-MemberOf-">
 % }
 % my $State = $m->scomp("/RTIR/Elements/ShowRTIRField", Ticket => $t, Name => 'State');
-  <a href="<%$RT::WebPath%>/RTIR/Display.html?id=<%$t->Id%>&Type=<%$Type%>"><%$t->Id%>: <%$t->Subject%></a> <i>(<%$State%>)</i>
+  <a href="<%$RT::WebPath%>/RTIR/Display.html?id=<%$t->Id%>"><%$t->Id%>: <%$t->Subject%></a> <i>(<%$State%>)</i>
   </td>
   <td align=right>
     <font size="-1"><& ShowDate, date => $t->DueObj &></font>
@@ -60,8 +60,8 @@
 % }
 </table>
 % if ($depth eq 1 and $MyTickets->Count eq 0) {
-% if (defined $QueueName) {
-  <i>(<% loc("no [_1]", $QueueName) %>)</i>
+% if (defined $Queue) {
+  <i>(<% loc("no [_1]", $Queue) %>)</i>
 % } else {
   <i>loc("no children")</i>
 % }
@@ -74,19 +74,9 @@
 % }
 
 <%INIT>
-my $QueueName;
-
-if ($Type eq "Investigation") {
-  $QueueName = "Investigations";
-} elsif ($Type eq "Block") {
-  $QueueName = "Blocks";
-} else {
-  $QueueName = "Incident Reports";
-}
-
 my $MyTickets;
 $MyTickets = new RT::Tickets ($session{'CurrentUser'});
-$MyTickets->LimitQueue(VALUE => $QueueName);
+$MyTickets->LimitQueue(VALUE => $Queue);
 $MyTickets->LimitMemberOf($Ticket->Id);
 $MyTickets->LimitStatus(VALUE => "new");
 $MyTickets->LimitStatus(VALUE => "open");
@@ -95,7 +85,7 @@
 
 my $ClosedTickets;
 $ClosedTickets = new RT::Tickets ($session{'CurrentUser'});
-$ClosedTickets->LimitQueue(VALUE => $QueueName);
+$ClosedTickets->LimitQueue(VALUE => $Queue);
 $ClosedTickets->LimitMemberOf($Ticket->Id);
 $ClosedTickets->LimitStatus(VALUE => "resolved");
 $ClosedTickets->OrderBy(FIELD => 'Resolved', ORDER => 'DESC');
@@ -103,10 +93,10 @@
 </%INIT>
 
 <%ARGS>
+$Queue => undef
 $Ticket => undef
 $depth => 1
 $LimitDepth => 0
 $Delete => 0
-$Type => 'Report'
 $FullList => undef
 </%ARGS>

Modified: rtir/branches/1.1-TESTING/html/RTIR/Incident/Display.html
==============================================================================
--- rtir/branches/1.1-TESTING/html/RTIR/Incident/Display.html	(original)
+++ rtir/branches/1.1-TESTING/html/RTIR/Incident/Display.html	Wed Sep 22 02:09:59 2004
@@ -110,7 +110,7 @@
 </td>
 <td valign=top>
 <& /Elements/TitleBoxStart, title => loc('Incident Reports'), 
-    title_href => "$RT::WebPath/RTIR/Incident/ShowReports.html?id=".$Ticket->Id, 
+    title_href => "$RT::WebPath/RTIR/Incident/ShowChildren.html?Queue=Incident Reports&id=".$Ticket->Id, 
     title_class=> 'inverse',  
     titleright => '', color=> "#336633" &>
 
@@ -124,9 +124,9 @@
 
     <& /RTIR/Elements/ShowChildren, 
 	    Ticket => $Ticket, 
-	    Type => 'Report',
+	    Queue => 'Incident Reports',
 	    LimitDepth => 8,
-            FullList => $RT::WebPath."/RTIR/Incident/ShowReports.html?id=".$Ticket->id
+            FullList => $RT::WebPath."/RTIR/Incident/ShowChildren.html?Queue=Incident Reports&id=".$Ticket->id
  &>
 <& /Elements/TitleBoxEnd &>
 </td>
@@ -134,7 +134,7 @@
 <tr>
   <TD VALIGN=TOP width=50%>
 	  <& /Elements/TitleBoxStart, title => loc('Investigations'), 
-		title_href => "$RT::WebPath/RTIR/Incident/ShowInvestigations.html?id=".$Ticket->Id, 
+		title_href => "$RT::WebPath/RTIR/Incident/ShowChildren.html?Queue=Investigations&id=".$Ticket->Id, 
 		title_class=> 'inverse',  
 		titleright => '', color=> "#336633" &>
 
@@ -148,16 +148,16 @@
 
 	        <& /RTIR/Elements/ShowChildren, 
 		    Ticket => $Ticket, 
-		    Type => 'Investigation',
+		    Queue => 'Investigations',
 		    LimitDepth => 8,
-		    FullList => $RT::WebPath."/RTIR/Incident/ShowInvestigations.html?id=".$Ticket->id
+		    FullList => $RT::WebPath."/RTIR/Incident/ShowChildren.html?Queue=Investigations&id=".$Ticket->id
  &>
 	<& /Elements/TitleBoxEnd &>
   </td>
   <TD VALIGN=TOP width=50%>
 
 	  <& /Elements/TitleBoxStart, title => loc('Blocks'), 
-		title_href => "$RT::WebPath/RTIR/Incident/ShowBlocks.html?id=".$Ticket->Id, 
+		title_href => "$RT::WebPath/RTIR/Incident/ShowChildren.html?Queue=Blocks&id=".$Ticket->Id, 
 		title_class=> 'inverse',  
 		titleright => '', color=> "#336633" &>
 
@@ -170,9 +170,9 @@
 
 	        <& /RTIR/Elements/ShowChildren, 
 		    Ticket => $Ticket, 
-		    Type => 'Block',
+		    Queue => 'Blocks',
 		    LimitDepth => 8,
-		    FullList => $RT::WebPath."/RTIR/Incident/ShowBlocks.html?id=".$Ticket->id &>
+		    FullList => $RT::WebPath."/RTIR/Incident/ShowChildren.html?Queue=Blocks&id=".$Ticket->id &>
 	<& /Elements/TitleBoxEnd &>
   </td>
 </tr>

Modified: rtir/branches/1.1-TESTING/html/RTIR/Incident/Reply.html
==============================================================================
--- rtir/branches/1.1-TESTING/html/RTIR/Incident/Reply.html	(original)
+++ rtir/branches/1.1-TESTING/html/RTIR/Incident/Reply.html	Wed Sep 22 02:09:59 2004
@@ -26,7 +26,7 @@
 <& Elements/LinkTabs, 
     Queue => 'Incident Reports',
     Ticket => $IncidentObj, 
-    current_tab => 'RTIR/Incident/ShowReports.html?id='.$IncidentObj->id,
+    current_tab => 'RTIR/Incident/ShowChildren.html?Queue=Incident Reports&id='.$IncidentObj->id,
     current_subtab => 'RTIR/Incident/ReplyToReporters.html',
     Tab => 'Bulk Reply',
     Title => $title &>


More information about the Rt-commit mailing list