Changeset 1330 for trunk

Timestamp:

05/04/15 18:23:54 (9 years ago)

Author:

nanardon

Message:

Improve the attributes autocomplete search

File:

• trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Json/RefVal.pm (modified) (1 diff)

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Json/RefVal.pm

@@ -30 +30 @@
     my $term = $c->req->param('term') || '';
 
-    my @values = grep { $_ =~ /\Q$term\E/i } $attribute->can_values;
+    my @values = $attribute->can_values;
 
-    if ($attribute->reference && scalar(@values) < 20) {
-        $c->stash->{data} = [ 
-            map { my $o = $base->get_object($attribute->reference, $_); { label => "$o", value => $_ } }
-            @values ];
+    if ($attribute->reference) {
+        if ($term) {
+            my %objs = ();
+            foreach my $attr (@{ $c->config->{objects}{$otype}{quick_search} || [ 'cn' ]}) {
+                foreach ($base->search_objects(
+                        $otype, "$attr~" . $term)) {
+                    $objs{$_} = 1;
+                }
+            }
+            @values = grep { $objs{$_} } @values;
+        }
+
+        if (scalar(@values) <= 20) {
+            $c->stash->{data} = [
+                map { my $o = $base->get_object($attribute->reference, $_); { label => "$o", value => $_ } }
+                @values ];
+        } else {
+            $c->stash->{data} = [ map { { label => $_, value => $_ } } @values ];
+        }
     } else {
-        $c->stash->{data} = [ map { { label => $_, value => $_ } } @values ];
+        $c->stash->{data} = [ map { { label => $_, value => $_ } } grep { $_ =~ /\Q$term\E/i } @values ];
     }
 }