[Rt-commit] [svn] r1639 - in rt/branches/3.2-RELEASE: . etc html/Ticket html/Ticket/Elements lib/RT lib/RT/Interface

jesse at pallas.eruditorum.org jesse at pallas.eruditorum.org
Fri Oct 8 17:03:22 EDT 2004


Author: jesse
Date: Fri Oct  8 17:03:21 2004
New Revision: 1639

Modified:
   rt/branches/3.2-RELEASE/   (props changed)
   rt/branches/3.2-RELEASE/etc/RT_Config.pm.in
   rt/branches/3.2-RELEASE/html/Ticket/Elements/EditCustomField
   rt/branches/3.2-RELEASE/html/Ticket/ModifyAll.html
   rt/branches/3.2-RELEASE/lib/RT/Interface/Web.pm
   rt/branches/3.2-RELEASE/lib/RT/Ticket_Overlay.pm
Log:
(Checked in in bulk, due to an svk issue) 


r2008 at tinbook:  jesse | 2004-10-07T21:55:45.446877Z
 RT-Ticket: 6148
 RT-Status: resolved
 
 When using the "Jumbo" update, modify ticket basics _after_ recording ticket updates, so that the update doesn't modify ticket status.
 
 r2009 at tinbook:  jesse | 2004-10-07T22:00:46.073565Z
 RT-Ticket: 6162
 RT-Status: resolved
 RT-Update: correspond
 
 If CustomFieldValues is called with a field name that
 is not valid for that queue all custom field values
 for that ticket are returned. I would expect that no
 custom field values should be returned.
 
 r2010 at tinbook:  jesse | 2004-10-07T22:05:43.278797Z
 RT-Ticket: 6165
 RT-Status: resolved
 RT-Update: correspond
 
 When you edited an 'Enter Multiple Values' custom field
 all values were displayed on one line and saved as one entry. 
 
 r2011 at tinbook:  jesse | 2004-10-07T22:07:47.103086Z
 RT-Ticket: 6166
 RT-Status: resolved
 RT-Update: correspond
 
 FreeformMultiple CFS are created using HTML textarea, so only one
 value is returned from the browser. RT 3.x currently treats
 as a single value and stores all values in one CF with embedded
 newlines. This patch fixes it so they are treated as separate CF values.
 
 -Todd
 
 r2012 at tinbook:  jesse | 2004-10-07T23:16:43.698794Z
 
 RT-Ticket: 4919
 RT-Status: resolved
 RT-Update: correspond
 
 Applied a patch from fw at deneb.enyo.de to give a better example for 
 address canonicalization
 
 r2014 at tinbook:  jesse | 2004-10-08T04:30:42.408690Z
 
 r2015 at tinbook:  jesse | 2004-10-08T04:40:10.976590Z
 


Modified: rt/branches/3.2-RELEASE/etc/RT_Config.pm.in
==============================================================================
--- rt/branches/3.2-RELEASE/etc/RT_Config.pm.in	(original)
+++ rt/branches/3.2-RELEASE/etc/RT_Config.pm.in	Fri Oct  8 17:03:21 2004
@@ -133,8 +133,8 @@
 # (These values are passed to the CanonicalizeEmailAddress subroutine in RT/User.pm)
 # By default, that routine performs a s/$Match/$Replace/gi on any address passed to it
 
-Set($CanonicalizeEmailAddressMatch   , 'subdomain.example.com$');
-Set($CanonicalizeEmailAddressReplace , 'example.com');
+#Set($CanonicalizeEmailAddressMatch , '@subdomain\.example\.com$');
+#Set($CanonicalizeEmailAddressReplace , '@example.com');
 
 # set this to true and the create new user page will use the values that you
 # enter in the form but use the function CanonicalizeUserInfo in User_Local.pm

Modified: rt/branches/3.2-RELEASE/html/Ticket/Elements/EditCustomField
==============================================================================
--- rt/branches/3.2-RELEASE/html/Ticket/Elements/EditCustomField	(original)
+++ rt/branches/3.2-RELEASE/html/Ticket/Elements/EditCustomField	Fri Oct  8 17:03:21 2004
@@ -60,7 +60,7 @@
 % my $content;
 % if ($TicketObj) {
 %          while (my $value = $Values->Next ) {
-%                 $content .= $value->Content;
+%                 $content .= "\n" . $value->Content;
 %           }
 % } elsif ($Default) {
           value="<%$Default ? $Default : ''%>"

Modified: rt/branches/3.2-RELEASE/html/Ticket/ModifyAll.html
==============================================================================
--- rt/branches/3.2-RELEASE/html/Ticket/ModifyAll.html	(original)
+++ rt/branches/3.2-RELEASE/html/Ticket/ModifyAll.html	Fri Oct  8 17:03:21 2004
@@ -136,7 +136,6 @@
 
 unless ($OnlySearchForPeople) {
     @wresults = ProcessTicketWatchers( TicketObj => $Ticket, ARGSRef => \%ARGS);
-    @results = ProcessTicketBasics( TicketObj => $Ticket, ARGSRef => \%ARGS);
  @cf_results = ProcessTicketCustomFieldUpdates( TicketObj => $Ticket, ARGSRef => \%ARGS);
     @dresults = ProcessTicketDates( TicketObj => $Ticket, ARGSRef => \%ARGS);
     @lresults = ProcessTicketLinks( TicketObj => $Ticket, ARGSRef => \%ARGS);
@@ -159,15 +158,11 @@
 
     $ARGS{'UpdateContent'} =~ s/\r+\n/\n/g;
 
-    if ($ARGS{'UpdateAttachments'} || (
-        $ARGS{'UpdateContent'} &&
-	$ARGS{'UpdateContent'} ne  "-- \n" . 
-				$session{'CurrentUser'}->UserObj->Signature
-       )) {
-   	 ProcessUpdateMessage(TicketObj => $Ticket, 
-			      ARGSRef=>\%ARGS, 
-                              Actions=>\@results);
+    if ($ARGS{'UpdateAttachments'} || ( $ARGS{'UpdateContent'} && $ARGS{'UpdateContent'} ne  "-- \n" . 
+				$session{'CurrentUser'}->UserObj->Signature)) {
+   	 ProcessUpdateMessage(TicketObj => $Ticket, ARGSRef=>\%ARGS, Actions=>\@results);
 	}
+    @results = ProcessTicketBasics( TicketObj => $Ticket, ARGSRef => \%ARGS);
 }
 push @results, @wresults;
 push @results, @dresults;

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	Fri Oct  8 17:03:21 2004
@@ -294,8 +294,18 @@
     );
     foreach my $arg (%ARGS) {
         if ($arg =~ /^CustomField-(\d+)(.*?)$/) {
+            my $cfid = $1;
+
             next if ($arg =~ /-Magic$/);
-            $create_args{"CustomField-".$1} = $ARGS{"$arg"};
+            my $cf = new RT::CustomField( $RT::SystemUser );
+            $cf->Load($cfid);
+
+            if ($cf->Type eq 'FreeformMultiple') {
+                $ARGS{$arg} =~ s/\r\n/\n/g;
+                $ARGS{$arg} = [split('\n', $ARGS{$arg})];
+            }
+
+            $create_args{"CustomField-".$cfid} = $ARGS{"$arg"};
         }
     }
 

Modified: rt/branches/3.2-RELEASE/lib/RT/Ticket_Overlay.pm
==============================================================================
--- rt/branches/3.2-RELEASE/lib/RT/Ticket_Overlay.pm	(original)
+++ rt/branches/3.2-RELEASE/lib/RT/Ticket_Overlay.pm	Fri Oct  8 17:03:21 2004
@@ -3345,6 +3345,7 @@
             $cf->LoadByNameAndQueue(Name => $field, Queue => '0');
         }
     }
+    return if ($field && !$cf->id);
     my $cf_values = RT::TicketCustomFieldValues->new( $self->CurrentUser );
     $cf_values->LimitToCustomField($cf->id) if $cf->id;
     $cf_values->LimitToTicket($self->Id());


More information about the Rt-commit mailing list