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

[jesse at pallas.eruditorum.org]

Author: jesse
Date: Mon Nov 15 12:04:25 2004
New Revision: 1900

Modified:
   rt/branches/3.2-RELEASE/   (props changed)
   rt/branches/3.2-RELEASE/html/Ticket/Elements/EditCustomField
   rt/branches/3.2-RELEASE/lib/RT/Interface/Web.pm
Log:
 r9255 at tinbook:  jesse | 2004-11-15T17:04:14.436394Z
 Fixes to allow setting "FreeformSingle" custom fields to an empty value.
     
 


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	Mon Nov 15 12:04:25 2004
@@ -44,6 +44,7 @@
 %# 
 %# }}} END BPS TAGGED BLOCK
 % my $Values;
+<input type="hidden" name="<%$NamePrefix%><%$CustomField->Id%>-Values-Magic" value="1">
 % if ($TicketObj) {
 %          $Values  = $TicketObj->CustomFieldValues($CustomField->id);
 % }
@@ -65,10 +66,8 @@
 % } elsif ($Default) {
           value="<%$Default ? $Default : ''%>"
 %  }
-<input type="hidden" name="<%$NamePrefix%><%$CustomField->Id%>-Values-Magic" value="1">
 <textarea cols=<%$Cols%> rows=<%$Rows%> name="<%$NamePrefix%><%$CustomField->Id%>-Values"><%$content%></textarea>
 % } elsif ($CustomField->Type =~ /^Select/) {
-      <input type="hidden" name="<%$NamePrefix%><%$CustomField->Id%>-Values-Magic" value="1">
       <select name="<%$NamePrefix%><%$CustomField->Id%>-Values"
         size="<%$Rows%>"
         <%$CustomField->Type eq 'SelectMultiple' && 'MULTIPLE'%>>

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	Mon Nov 15 12:04:25 2004
@@ -1090,7 +1090,8 @@
                 # to fake it
                 if ($arg =~ /^(.*?)-Values-Magic$/ ) {
                     # We don't care about the magic, if there's really a values element;
-                    next if (exists $ARGSRef->{$1.'-Values'}) ;
+                    next if ( $ARGSRef->{$1.'-Values'} ||
+                              $ARGSRef->{$1.'-Value'}) ;
 
                     $arg = $1."-Values";
                     $ARGSRef->{$1."-Values"} = undef;