projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
starting to work...
[freeside.git]
/
rt
/
share
/
html
/
Helpers
/
Autocomplete
/
CustomFieldValues
diff --git
a/rt/share/html/Helpers/Autocomplete/CustomFieldValues
b/rt/share/html/Helpers/Autocomplete/CustomFieldValues
index
85323cc
..
b8b21e4
100644
(file)
--- a/
rt/share/html/Helpers/Autocomplete/CustomFieldValues
+++ b/
rt/share/html/Helpers/Autocomplete/CustomFieldValues
@@
-2,7
+2,7
@@
%#
%# COPYRIGHT:
%#
%#
%# COPYRIGHT:
%#
-%# This software is Copyright (c) 1996-201
1
Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-201
2
Best Practical Solutions, LLC
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
%# <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 }}}
%# 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>
% $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?$/;
next unless $k =~ /^Object-.*?-\d*-CustomField-(\d+)-Values?$/;
-
($CustomField, $Value) = ($1, $v)
;
+
$CustomField = $1
;
last;
}
last;
}
+
$m->abort unless $CustomField;
my $CustomFieldObj = RT::CustomField->new( $session{'CurrentUser'} );
$CustomFieldObj->Load( $CustomField );
$m->abort unless $CustomField;
my $CustomFieldObj = RT::CustomField->new( $session{'CurrentUser'} );
$CustomFieldObj->Load( $CustomField );
+
my $values = $CustomFieldObj->Values;
$values->Limit(
FIELD => 'Name',
OPERATOR => 'LIKE',
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',
);
$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>
</%INIT>