[Rt-commit] [svn] r1705 - in rt/branches/3.2-RELEASE: . html/Search lib/RT/Interface

[jesse at pallas.eruditorum.org]

Author: jesse
Date: Sun Oct 31 23:42:41 2004
New Revision: 1705

Modified:
   rt/branches/3.2-RELEASE/   (props changed)
   rt/branches/3.2-RELEASE/html/Search/Bulk.html
   rt/branches/3.2-RELEASE/lib/RT/Interface/Web.pm
Log:
 r6151 at tinbook:  jesse | 2004-11-01T04:42:20.034865Z
 RT-Ticket: 6242
 RT-Status: resolved
 RT-Update: correspond
 
 There were a couple of bugs in the bulk update page that broke ticket linking.
 (Among other things, the custom fields update functionality was completely broken. It's been disabled pending a new implementation)
 
 


Modified: rt/branches/3.2-RELEASE/html/Search/Bulk.html
==============================================================================
--- rt/branches/3.2-RELEASE/html/Search/Bulk.html	(original)
+++ rt/branches/3.2-RELEASE/html/Search/Bulk.html	Sun Oct 31 23:42:41 2004
@@ -47,8 +47,8 @@
 <& /Elements/Tabs, Title => loc("Bulk ticket update") &>
 
 <& /Elements/ListActions, actions => \@results &>
-
-<FORM METHOD=POST>
+<FORM METHOD="POST" ACTION="<%$RT::WebPath%>/Search/Bulk.html" >
+<input type="hidden" name="Query" value="<%$ARGS{'Query'}%>">
 <TABLE WIDTH=100% border=0 cellpadding=3 CELLSPACING=0>
 <TR>
 <TH><&|/l&>Update</&></TH>
@@ -159,6 +159,8 @@
  </td></tr>
  </table>
 
+<& /Elements/TitleBoxEnd &>
+% if (0) {
 <table>
 % foreach (keys %allcfs) {
 <tr><td class=label>
@@ -186,8 +188,8 @@
 </tr>
 % }
 </table>
+% }
 
-<& /Elements/TitleBoxEnd &>
 
 <& /Elements/TitleBoxStart, title => loc('Edit Links'), color => "#336633"&>
 <i><&|/l&>Enter tickets or URIs to link tickets to. Seperate multiple entries with spaces.</&></i><br>
@@ -262,16 +264,6 @@
     #Update the watchers
     my @watchresults = ProcessTicketWatchers(TicketObj => $Ticket, ARGSRef => \%ARGS);    
 
-    #Update custom fields
-    my $pat = "^(\\d+)-(.*)\$";
-    foreach (keys %ARGS) {
-	$ARGS{"Ticket-" . $Ticket->Id . "-CustomField-" . $1 . "-" . $2} = $ARGS{$_} if (/$pat/o);
-    }
-    my @cfresults = ProcessTicketCustomFieldUpdates(ARGSRef => \%ARGS);
-    foreach (keys %ARGS) {
-	delete $ARGS{"Ticket-" . $Ticket->Id . "-CustomField-" . $1 . "-" . $2} if (/$pat/o);
-    }
-
 
     #Update the links
     $ARGS{'id'} = $Ticket;
@@ -291,8 +283,8 @@
     delete $ARGS{'MemberOf-'.$Ticket->Id};
     delete $ARGS{$Ticket->Id.'-RefersTo'};
     delete $ARGS{'RefersTo-'.$Ticket->Id};
-    
-    my @tempresults = (@watchresults, @basicresults, @dateresults, @updateresults, @linkresults, @cfresults);
+    my @tempresults = (@watchresults, @basicresults, @dateresults,
+    @updateresults, @linkresults);
     @tempresults = map { loc("Ticket [_1]: [_2]",$Ticket->Id,$_) } @tempresults;
 
     @results = (@results, @tempresults);

Modified: rt/branches/3.2-RELEASE/lib/RT/Interface/Web.pm
==============================================================================
--- rt/branches/3.2-RELEASE/lib/RT/Interface/Web.pm	(original)
+++ rt/branches/3.2-RELEASE/lib/RT/Interface/Web.pm	Sun Oct 31 23:42:41 2004
@@ -869,7 +869,6 @@
                 $obj = $object_type->new($session{'CurrentUser'});
                 $obj->Load($object_id);      
             } else {
-		die;
                 push (@results, loc("System Error"). ': '.
                                 loc("Rights could not be revoked for [_1]", $object_type));
                 next;
@@ -1183,7 +1182,7 @@
 		    }
 		}
                 else {
-                    push ( @results, "User asked for an unknown update type for custom field " . $cf->Name . " for ticket " . $Ticket->id );
+                    push ( @results, "User asked for an unknown update type for custom field " . $CustomFieldObj->Name . " for ticket " . $Ticket->id );
                 }
             }
         }
@@ -1346,6 +1345,7 @@
     my $Ticket  = $args{'TicketObj'};
     my $ARGSRef = $args{'ARGSRef'};
 
+
     my (@results) = ProcessRecordLinks(RecordObj => $Ticket,
 				       ARGSRef => $ARGSRef);