[Rt-commit] [svn] r1103 - in rt/branches/rt-3.1: html/Admin/Elements html/Admin/Queues html/Ticket/Elements lib/RT lib/RT/Interface

[leira at pallas.eruditorum.org]

Author: leira
Date: Thu Jun 17 15:08:04 2004
New Revision: 1103

Modified:
   rt/branches/rt-3.1/html/Admin/Elements/EditQueueWatchers
   rt/branches/rt-3.1/html/Admin/Queues/People.html
   rt/branches/rt-3.1/html/Ticket/Elements/EditWatchers
   rt/branches/rt-3.1/lib/RT/Interface/Web.pm
   rt/branches/rt-3.1/lib/RT/Queue_Overlay.pm
   rt/branches/rt-3.1/lib/RT/Ticket_Overlay.pm
Log:
RT-Ticket: 3240
RT-Status: resolved
RT-Action: comment

Everything but Transaction type is now "DeleteWatcher" rather than "DelWatcher".


Modified: rt/branches/rt-3.1/html/Admin/Elements/EditQueueWatchers
==============================================================================
--- rt/branches/rt-3.1/html/Admin/Elements/EditQueueWatchers	(original)
+++ rt/branches/rt-3.1/html/Admin/Elements/EditQueueWatchers	Thu Jun 17 15:08:04 2004
@@ -30,7 +30,7 @@
 % while (my $watcher=$Members->Next) {
 <li>
 <INPUT  TYPE=CHECKBOX 
-        NAME="Queue-<%$QueueObj->Id%>-DelWatcher-Type-<%$Watchers->Type%>-Principal-<%$watcher->MemberId%>" 
+        NAME="Queue-<%$QueueObj->Id%>-DeleteWatcher-Type-<%$Watchers->Type%>-Principal-<%$watcher->MemberId%>" 
         UNCHECKED>
 % if ($watcher->MemberObj->IsUser) { 
 <a href="<%$RT::WebPath%>/Admin/Users/Modify.html?id=<%$watcher->MemberObj->ObjectId%>">

Modified: rt/branches/rt-3.1/html/Admin/Queues/People.html
==============================================================================
--- rt/branches/rt-3.1/html/Admin/Queues/People.html	(original)
+++ rt/branches/rt-3.1/html/Admin/Queues/People.html	Thu Jun 17 15:08:04 2004
@@ -125,7 +125,7 @@
 foreach my $key (keys %ARGS) {
         my $id = $QueueObj->Id;
 
-    if (($key =~ /^Queue-$id-DelWatcher-Type-(.*?)-Principal-(\d*)$/)) {;
+    if (($key =~ /^Queue-$id-DeleteWatcher-Type-(.*?)-Principal-(\d*)$/)) {;
 	    my ($code, $msg) = $QueueObj->DeleteWatcher(Type => $1,
                                                     PrincipalId => $2);
 	    push @results, $msg;

Modified: rt/branches/rt-3.1/html/Ticket/Elements/EditWatchers
==============================================================================
--- rt/branches/rt-3.1/html/Ticket/Elements/EditWatchers	(original)
+++ rt/branches/rt-3.1/html/Ticket/Elements/EditWatchers	Thu Jun 17 15:08:04 2004
@@ -30,7 +30,7 @@
 
 %while (my $watcher=$Members->Next) {
 <li>
-<INPUT TYPE=CHECKBOX NAME="Ticket-DelWatcher-Type-<%$Watchers->Type%>-Principal-<%$watcher->MemberId%>" UNCHECKED>
+<INPUT TYPE=CHECKBOX NAME="Ticket-DeleteWatcher-Type-<%$Watchers->Type%>-Principal-<%$watcher->MemberId%>" UNCHECKED>
 %if ($watcher->MemberObj->IsUser) { 
 <a href="<%$RT::WebPath%>/Admin/Users/Modify.html?id=<%$watcher->MemberObj->Object->id%>">
 <%$watcher->MemberObj->Object->Name%></a>

Modified: rt/branches/rt-3.1/lib/RT/Interface/Web.pm
==============================================================================
--- rt/branches/rt-3.1/lib/RT/Interface/Web.pm	(original)
+++ rt/branches/rt-3.1/lib/RT/Interface/Web.pm	Thu Jun 17 15:08:04 2004
@@ -1239,7 +1239,7 @@
     foreach my $key ( keys %$ARGSRef ) {
 
         # {{{ Delete deletable watchers
-        if ( ( $key =~ /^Ticket-DelWatcher-Type-(.*)-Principal-(\d+)$/ )  ) {
+        if ( ( $key =~ /^Ticket-DeleteWatcher-Type-(.*)-Principal-(\d+)$/ )  ) {
             my ( $code, $msg ) = 
                 $Ticket->DeleteWatcher(PrincipalId => $2,
                                        Type => $1);

Modified: rt/branches/rt-3.1/lib/RT/Queue_Overlay.pm
==============================================================================
--- rt/branches/rt-3.1/lib/RT/Queue_Overlay.pm	(original)
+++ rt/branches/rt-3.1/lib/RT/Queue_Overlay.pm	Thu Jun 17 15:08:04 2004
@@ -750,8 +750,8 @@
             }
         }
         else {
-            $RT::Logger->warn( "$self -> DelWatcher got passed a bogus type");
-            return ( 0, $self->loc('Error in parameters to Queue->DelWatcher') );
+            $RT::Logger->warn( "$self -> DeleteWatcher got passed a bogus type");
+            return ( 0, $self->loc('Error in parameters to Queue->DeleteWatcher') );
         }
     }
 

Modified: rt/branches/rt-3.1/lib/RT/Ticket_Overlay.pm
==============================================================================
--- rt/branches/rt-3.1/lib/RT/Ticket_Overlay.pm	(original)
+++ rt/branches/rt-3.1/lib/RT/Ticket_Overlay.pm	Thu Jun 17 15:08:04 2004
@@ -1627,7 +1627,7 @@
         else {
             $RT::Logger->warn("$self -> DeleteWatcher got passed a bogus type");
             return ( 0,
-                     $self->loc('Error in parameters to Ticket->DelWatcher') );
+                     $self->loc('Error in parameters to Ticket->DeleteWatcher') );
         }
     }