[Rt-commit] r2940 - rt/branches/CHALDEA-EXPERIMENTAL/html/Elements

[autrijus at bestpractical.com]

Author: autrijus
Date: Tue May 24 10:33:27 2005
New Revision: 2940

Modified:
   rt/branches/CHALDEA-EXPERIMENTAL/html/Elements/EditCustomFieldCombobox
   rt/branches/CHALDEA-EXPERIMENTAL/html/Elements/ValidateCustomFields
Log:
* validation for combo fields.
* combo fields should never wrap.

Modified: rt/branches/CHALDEA-EXPERIMENTAL/html/Elements/EditCustomFieldCombobox
==============================================================================
--- rt/branches/CHALDEA-EXPERIMENTAL/html/Elements/EditCustomFieldCombobox	(original)
+++ rt/branches/CHALDEA-EXPERIMENTAL/html/Elements/EditCustomFieldCombobox	Tue May 24 10:33:27 2005
@@ -49,6 +49,7 @@
 % }
 % (!$Multiple or !$MaxValues or !$Values or $Values->Count < $MaxValues) or return;
 % my $name = $NamePrefix . $CustomField->Id . "-Values";
+<nobr>
 <script type="text/javascript" src="<%$RT::WebPath%>/NoAuth/combobox.js"></script>
 
 <span id="<% $name %>_Container">
@@ -69,6 +70,7 @@
     ComboBox_Init();
 }
 //--></script>
+</nobr>
 <%ARGS>
 $Object => undef
 $CustomField => undef

Modified: rt/branches/CHALDEA-EXPERIMENTAL/html/Elements/ValidateCustomFields
==============================================================================
--- rt/branches/CHALDEA-EXPERIMENTAL/html/Elements/ValidateCustomFields	(original)
+++ rt/branches/CHALDEA-EXPERIMENTAL/html/Elements/ValidateCustomFields	Tue May 24 10:33:27 2005
@@ -4,8 +4,20 @@
 while (my $CF = $CustomFields->Next) {
     my $pattern = $CF->Pattern;
     my $field = $NamePrefix . $CF->Id . "-Value";
-    $m->notes(('Field-' . $CF->Id) => $ARGSRef->{$field});
-    next if $CF->MatchPattern($ARGSRef->{$field});
+    my $value;
+
+    if ($ARGSRef->{"${field}s-Magic"}) {
+        $value = $ARGSRef->{"${field}s"};
+
+        # We only validate Single Combos -- multis can never be user input
+        next if ref $value;
+    }
+    else {
+        $value = $ARGSRef->{$field};
+    }
+
+    $m->notes(('Field-' . $CF->Id) => $value);
+    next if $CF->MatchPattern($value);
     $m->notes(
         ('InvalidField-' . $CF->Id)
             => (loc("Input must match [_1]", $pattern))