[Rt-commit] r4653 - in rt/branches/3.7-EXPERIMENTAL: . html/Helpers/Autocomplete

[ruz at bestpractical.com]

Author: ruz
Date: Thu Mar  2 11:50:21 2006
New Revision: 4653

Added:
   rt/branches/3.7-EXPERIMENTAL/html/Helpers/Autocomplete/
   rt/branches/3.7-EXPERIMENTAL/html/Helpers/Autocomplete/CustomFieldValues
Modified:
   rt/branches/3.7-EXPERIMENTAL/   (props changed)
   rt/branches/3.7-EXPERIMENTAL/html/Elements/EditCustomFieldAutocomplete

Log:
 r1996 at cubic-pc:  cubic | 2006-03-02 14:08:54 +0300
  r1994 at cubic-pc:  cubic | 2006-03-02 14:05:47 +0300
  * Elements dirs are private and shouldn't be called from browser
  ** autocompletion choices generation moved to /Helpers/Autocomplete
  ** new component /Helpers/Autocomplete/CustomFieldValues
 


Modified: rt/branches/3.7-EXPERIMENTAL/html/Elements/EditCustomFieldAutocomplete
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Elements/EditCustomFieldAutocomplete	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Elements/EditCustomFieldAutocomplete	Thu Mar  2 11:50:21 2006
@@ -6,15 +6,11 @@
 new Ajax.Autocompleter(
     "<% $name %>-Values",
     "<% $name %>-Choices",
-    "/Elements/EditCustomFieldAutocomplete",
-    {paramName: "GetChoices-<% $name %>"}
+    "/Helpers/Autocomplete/CustomFieldValues",
+    {}
 );
 </script>
 <%INIT>
-while( my($k, $v) = each %ARGS ) {
-    next unless $k =~ /^GetChoices-Object-.*?-\d*-CustomField-(\d+)$/;
-    return $m->comp("SELF:Choices", Value => $v, CustomField => $1 );
-}
 my $name = $NamePrefix . $CustomField->Id;
 </%INIT>
 <%ARGS>
@@ -25,30 +21,3 @@
 $Values      => undef
 $MaxValues   => undef
 </%ARGS>
-
-<%METHOD Choices>
-<%ARGS>
-$CustomField => undef
-$Value       => undef
-</%ARGS>
-<ul>
-% while( my $value = $values->Next ) {
-% my $desc = $value->Description || '';
-% $desc = '<span class="informal"> ('. $m->interp->apply_escapes( $desc,  'h' ) .')</span>' if $desc;
-<li><% $value->Name %><% $desc |n %></li>
-% }
-</ul>
-% $m->abort;
-<%INIT>
-my $CustomFieldObj = RT::CustomField->new( $session{'CurrentUser'} );
-$CustomFieldObj->Load( $CustomField );
-my $values = $CustomFieldObj->Values;
-$values->Limit( FIELD => 'Name', OPERATOR => 'LIKE', VALUE => $Value );
-$values->Limit(
-    ENTRYAGGREGATOR => 'OR',
-    FIELD           => 'Description',
-    OPERATOR        => 'LIKE',
-    VALUE           => $Value,
-);
-</%INIT>
-</%METHOD>

Added: rt/branches/3.7-EXPERIMENTAL/html/Helpers/Autocomplete/CustomFieldValues
==============================================================================
--- (empty file)
+++ rt/branches/3.7-EXPERIMENTAL/html/Helpers/Autocomplete/CustomFieldValues	Thu Mar  2 11:50:21 2006
@@ -0,0 +1,28 @@
+<ul>
+% while( my $value = $values->Next ) {
+% my $desc = $value->Description || '';
+% $desc = '<span class="informal"> ('. $m->interp->apply_escapes( $desc,  'h' ) .')</span>' if $desc;
+<li><% $value->Name %><% $desc |n %></li>
+% }
+</ul>
+% $m->abort;
+<%INIT>
+my ($CustomField, $Value);
+while( my($k, $v) = each %ARGS ) {
+    next unless $k =~ /^Object-.*?-\d*-CustomField-(\d+)-Values$/;
+    ($CustomField, $Value) = ($1, $v);
+    last;
+}
+$m->abort unless $CustomField;
+
+my $CustomFieldObj = RT::CustomField->new( $session{'CurrentUser'} );
+$CustomFieldObj->Load( $CustomField );
+my $values = $CustomFieldObj->Values;
+$values->Limit( FIELD => 'Name', OPERATOR => 'LIKE', VALUE => $Value );
+$values->Limit(
+    ENTRYAGGREGATOR => 'OR',
+    FIELD           => 'Description',
+    OPERATOR        => 'LIKE',
+    VALUE           => $Value,
+);
+</%INIT>