[Rt-commit] [svn] r1579 - in rtir/branches/1.1-TESTING: html/RTIR/Incident lib/RT/Action

[leira at pallas.eruditorum.org]

Author: leira
Date: Wed Sep 29 03:25:30 2004
New Revision: 1579

Modified:
   rtir/branches/1.1-TESTING/html/RTIR/Incident/ShowChildren.html
   rtir/branches/1.1-TESTING/lib/RT/Action/RTIR_ChangeChildOwnership.pm
   rtir/branches/1.1-TESTING/lib/RT/Action/RTIR_ResolveChildren.pm
Log:
RT-Ticket: 6096
RT-Action: correspond
Replace all instances of ->Members with TicketSQL.


Modified: rtir/branches/1.1-TESTING/html/RTIR/Incident/ShowChildren.html
==============================================================================
--- rtir/branches/1.1-TESTING/html/RTIR/Incident/ShowChildren.html	(original)
+++ rtir/branches/1.1-TESTING/html/RTIR/Incident/ShowChildren.html	Wed Sep 29 03:25:30 2004
@@ -75,13 +75,12 @@
     Abort("No permission to view ticket");
   }
 
-  $count=0;
-  while (my $link = $Incident->Members->Next) {
-    my $member= $link->BaseObj;
-    if ($member->QueueObj->Name eq $Queue) {
-      $count++;
-    }
-  }
+  my $query = "Queue = '$Queue' AND MemberOf = " . $Incident->Id;
+
+  my $members = new RT::Tickets($session{'CurrentUser'});
+  $members->FromSQL($query);
+
+  $count = $members->Count;
 
 </%INIT>
 

Modified: rtir/branches/1.1-TESTING/lib/RT/Action/RTIR_ChangeChildOwnership.pm
==============================================================================
--- rtir/branches/1.1-TESTING/lib/RT/Action/RTIR_ChangeChildOwnership.pm	(original)
+++ rtir/branches/1.1-TESTING/lib/RT/Action/RTIR_ChangeChildOwnership.pm	Wed Sep 29 03:25:30 2004
@@ -75,13 +75,14 @@
 sub Commit {
     my $self = shift;
 
+    my $query = "(Queue = 'Incident Reports' OR Queue = 'Investigations' OR Queue = 'Blocks') AND MemberOf = " . $self->TicketObj->Id;
+
+    my $members = new RT::Tickets($self->TransactionObj->CurrentUser);
+    $members->FromSQL($query);
+
     # change owner of child Incident Reports, Investigations, Blocks
-    while (my $link = $self->TicketObj->Members->Next) {
-	my $member= $link->BaseObj;
-	if ( ($member->QueueObj->Name eq 'Incident Reports' ||
-	      $member->QueueObj->Name eq 'Investigations' ||
-	      $member->QueueObj->Name eq 'Blocks' ) &&
-	     $member->OwnerObj->id != $self->TransactionObj->NewValue) {
+    while (my $member = $members->Next) {
+	if ($member->OwnerObj->id != $self->TransactionObj->NewValue) {
 	    my ($res, $msg); 
 	    my $user = new RT::CurrentUser($self->TransactionObj->CurrentUser);
 	    $user->Load($self->TransactionObj->Creator);

Modified: rtir/branches/1.1-TESTING/lib/RT/Action/RTIR_ResolveChildren.pm
==============================================================================
--- rtir/branches/1.1-TESTING/lib/RT/Action/RTIR_ResolveChildren.pm	(original)
+++ rtir/branches/1.1-TESTING/lib/RT/Action/RTIR_ResolveChildren.pm	Wed Sep 29 03:25:30 2004
@@ -80,14 +80,14 @@
 sub Commit {
     my $self = shift;
 
+    my $query = "(Queue = 'Incident Reports' OR Queue = 'Investigations' OR Queue = 'Blocks') AND MemberOf = " . $self->TicketObj->Id;
+
+    my $members = new RT::Tickets($self->TransactionObj->CurrentUser);
+    $members->FromSQL($query);
+
     my $members = $self->TicketObj->Members;
-    while (my $link = $members->Next) {
-	my $member= $link->BaseObj;
-	if ($member->QueueObj->Name eq 'Blocks' or
-	    $member->QueueObj->Name eq 'Investigations' or
-	    $member->QueueObj->Name eq 'Incident Reports') {
-	    $member->Resolve();
-	}
+    while (my $member = $members->Next) {
+	$member->Resolve();
     }
     return 1;
 }