1 files changed, 28 insertions, 15 deletions
diff --git a/rt/share/html/Helpers/Autocomplete/CustomFieldValues b/rt/share/html/Helpers/Autocomplete/CustomFieldValues
index 85323ccc3..b8b21e4fe 100644
--- a/rt/share/html/Helpers/Autocomplete/CustomFieldValues
+++ b/rt/share/html/Helpers/Autocomplete/CustomFieldValues
@@ -2,7 +2,7 @@
 %#
 %# COPYRIGHT:
 %#
-%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC
 %#                                          <sales@bestpractical.com>
 %#
 %# (Except where explicitly superseded by other copyright notices)
@@ -45,37 +45,50 @@
 %# those contributions and any derivatives thereof.
 %#
 %# END BPS TAGGED BLOCK }}}
-<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>
+% $r->content_type('application/json');
+<% JSON( \@suggestions ) |n %>
 % $m->abort;
 <%INIT>
-my ($CustomField, $Value);
-while( my($k, $v) = each %ARGS ) {
+# Only autocomplete the last value
+my $term = (split /\n/, $ARGS{term} || '')[-1];
+
+my $CustomField;
+for my $k ( keys %ARGS ) {
     next unless $k =~ /^Object-.*?-\d*-CustomField-(\d+)-Values?$/;
-    ($CustomField, $Value) = ($1, $v);
+    $CustomField = $1;
     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,
-    SUBCLAUSE       => 'autcomplete',
+    VALUE           => $term,
+    SUBCLAUSE       => 'autocomplete',
+    CASESENSITIVE   => 0,
 );
 $values->Limit(
     ENTRYAGGREGATOR => 'OR',
     FIELD           => 'Description',
     OPERATOR        => 'LIKE',
-    VALUE           => $Value,
-    SUBCLAUSE       => 'autcomplete',
+    VALUE           => $term,
+    SUBCLAUSE       => 'autocomplete',
+    CASESENSITIVE   => 0,
 );
 
+my @suggestions;
+
+while( my $value = $values->Next ) {
+    push @suggestions,
+      {
+        value => $value->Name,
+        label => $value->Description
+        ? $value->Name . ' (' . $value->Description . ')'
+        : $value->Name,
+      };
+}
 </%INIT>