Changeset 1135 for trunk/LATMOS-Accounts-Web/lib

Timestamp:

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

Author:

nanardon

Message:

Merge branch 'dyngroup'

Location:

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web

Files:

• Controller/Ajax (added)
• Controller/Ajax.pm (modified) (2 diffs)
• Controller/Ajax/Services (added)
• Controller/Ajax/Services/Mailing.pm (added)
• Controller/Services (added)
• Controller/Services/Mailing.pm (added)
• Model/AttrFilter.pm (modified) (1 diff)

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)
-    ]);
+    ];
 
 }

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Model/AttrFilter.pm

@@ -41 +41 @@
 
     my @objlist = ();
-    if ($c->req->params->{'q'}) {
-        my %objs;
-        foreach my $attr (@{ $c->config->{objects}{$otype}{quick_search} || [ 'cn' ]}) {
-            foreach ($base->search_objects(
-                    $otype, "$attr~" . $c->req->params->{'q'})) {
-                $objs{$_} = 1;
+    if ($c->req->params->{'q'} || exists($c->req->params->{'attr'}) ) {
+        my %objs = ();
+        if ($c->req->params->{'q'}) {
+            foreach my $attr (@{ $c->config->{objects}{$otype}{quick_search} || [ 'cn' ]}) {
+                foreach ($base->search_objects(
+                        $otype, "$attr~" . $c->req->params->{'q'})) {
+                    $objs{$_} = 1;
+                }
+                @objlist = sort keys %objs;
             }
-            @objlist = sort keys %objs;
         }
-    } elsif (exists($c->req->params->{'attr'})) {
-        $self->{filter}{'attr'} = [ $c->req->param('attr') ];
-        $self->{filter}{'attrval'} = [ $c->req->param('attrval') ];
-        my @filter = $self->filter;
-        @objlist = $base->search_objects($otype, @filter);
+
+        if (exists($c->req->params->{'attr'})) {
+            $self->{filter}{'attr'} = [ $c->req->param('attr') ];
+            $self->{filter}{'attrval'} = [ $c->req->param('attrval') ];
+            my @filter = $self->filter;
+            @objlist = $base->search_objects($otype, @filter);
+            if ($c->req->params->{'q'}) {
+                @objlist = grep { $objs{$_} } @objlist;
+            }
+        }
     } else {
         @objlist = $base->list_objects($otype);