Changeset 1135 for trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Ajax.pm

Timestamp:

09/15/12 08:52:16 (12 years ago)

Author:

nanardon

Message:

Merge branch 'dyngroup'

File:

• trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Ajax.pm (modified) (2 diffs)

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Ajax.pm

@@ -46 +46 @@
 
 sub displayattr : Local {
-    my ($self, $c, $otype) = @_;
-    my $attribute = $c->model('Accounts')->db->attribute($otype,
-        $c->req->param('attr')) or return;
+    my ($self, $c, $otype, $attr) = @_;
+    $attr ||= $c->req->param('attr');
+    my $attribute = $c->model('Accounts')->db->attribute($otype, $attr) or return;
     $c->stash->{value} = $attribute->display($c->req->param('id'));
 }
@@ -56 +56 @@
 
     my $base = $c->model('Accounts')->db;
-    my $val = $c->req->param('val');
-    $c->stash->{'complete'} = $c->prototype->auto_complete_result([
+    my $val = $c->req->param('val') || '';
+    $c->stash->{values} = [
+        sort
         grep { /^\Q$val\E/ } $base->attributes_summary($otype, $attr)
-    ]);
+    ];
 
 }