Ignore:
Timestamp:
09/15/12 08:52:16 (12 years ago)
Author:
nanardon
Message:

Merge branch 'dyngroup'

Location:
trunk/LATMOS-Accounts-Web
Files:
20 added
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/LATMOS-Accounts-Web/MANIFEST

    r1132 r1135  
    1515lib/LATMOS/Accounts/Web/Controller/Admin/Requests.pm 
    1616lib/LATMOS/Accounts/Web/Controller/Ajax.pm 
     17lib/LATMOS/Accounts/Web/Controller/Ajax/Services/Mailing.pm 
    1718lib/LATMOS/Accounts/Web/Controller/Aliases.pm 
    1819lib/LATMOS/Accounts/Web/Controller/Create.pm 
    … …  
    2526lib/LATMOS/Accounts/Web/Controller/Rpc.pm 
    2627lib/LATMOS/Accounts/Web/Controller/Search.pm 
     28lib/LATMOS/Accounts/Web/Controller/Services/Mailing.pm 
    2729lib/LATMOS/Accounts/Web/Controller/Sites.pm 
    2830lib/LATMOS/Accounts/Web/Controller/Summary/Departments.pm 
    … …  
    5456root/html/ajax/select_freeip_select.tt 
    5557root/html/ajax/select_objects_list.tt 
     58root/html/ajax/services/mailing/dest_list.tt 
     59root/html/ajax/services/mailing/users_list.tt 
    5660root/html/ajax/set_attrs.tt 
    5761root/html/ajax/user_to_group_form.tt 
    … …  
    9599root/html/request/recorded.tt 
    96100root/html/search/index.tt 
     101root/html/services/mailing/filter.tt 
     102root/html/services/mailing/index.tt 
     103root/html/services/mailing/send.tt 
     104root/html/services/mailing/to.tt 
    97105root/html/sites/default.tt 
    98106root/html/sites/index.tt 
    … …  
    122130root/static/icons/document-save-as.png 
    123131root/static/icons/document-save.png 
     132root/static/icons/editclear.png 
    124133root/static/icons/emblem-favorite.png 
    125134root/static/icons/emblem-urgent.png 
    126135root/static/icons/expired.png 
     136root/static/icons/find.png 
    127137root/static/icons/gnome-session-logout.png 
    128138root/static/icons/gnome-stock-mail-snd.png 
    … …  
    139149root/static/icons/gtk-home.png 
    140150root/static/icons/gtk-jump-to-rtl.png 
     151root/static/icons/gtk-refresh.png 
    141152root/static/icons/help-contents.png 
    142153root/static/icons/icon_edit.png 
    … …  
    198209t/04config_load.t 
    199210t/controller_About.t 
     211t/controller_Ajax-Services-Mailing.t 
    200212t/controller_Ajax.t 
    201213t/controller_Aliases.t 
    … …  
    206218t/controller_Request.t 
    207219t/controller_Search.t 
     220t/controller_Services-Mailing.t 
    208221t/controller_Sites.t 
    209222t/controller_Summary-Department.t 

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

    r1107 r1135  
    4646 
    4747sub displayattr : Local { 
    48     my ($self, $c, $otype) = @_; 
    49     my $attribute = $c->model('Accounts')->db->attribute($otype, 
    50         $c->req->param('attr')) or return; 
     48    my ($self, $c, $otype, $attr) = @_; 
     49    $attr ||= $c->req->param('attr'); 
     50    my $attribute = $c->model('Accounts')->db->attribute($otype, $attr) or return; 
    5151    $c->stash->{value} = $attribute->display($c->req->param('id')); 
    5252} 
    … …  
    5656 
    5757    my $base = $c->model('Accounts')->db; 
    58     my $val = $c->req->param('val'); 
    59     $c->stash->{'complete'} = $c->prototype->auto_complete_result([ 
     58    my $val = $c->req->param('val') || ''; 
     59    $c->stash->{values} = [ 
     60        sort 
    6061        grep { /^\Q$val\E/ } $base->attributes_summary($otype, $attr) 
    61     ]); 
     62    ]; 
    6263 
    6364} 

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

    r1131 r1135  
    4141 
    4242    my @objlist = (); 
    43     if ($c->req->params->{'q'}) { 
    44         my %objs; 
    45         foreach my $attr (@{ $c->config->{objects}{$otype}{quick_search} || [ 'cn' ]}) { 
    46             foreach ($base->search_objects( 
    47                     $otype, "$attr~" . $c->req->params->{'q'})) { 
    48                 $objs{$_} = 1; 
     43    if ($c->req->params->{'q'} || exists($c->req->params->{'attr'}) ) { 
     44        my %objs = (); 
     45        if ($c->req->params->{'q'}) { 
     46            foreach my $attr (@{ $c->config->{objects}{$otype}{quick_search} || [ 'cn' ]}) { 
     47                foreach ($base->search_objects( 
     48                        $otype, "$attr~" . $c->req->params->{'q'})) { 
     49                    $objs{$_} = 1; 
     50                } 
     51                @objlist = sort keys %objs; 
    4952            } 
    50             @objlist = sort keys %objs; 
    5153        } 
    52     } elsif (exists($c->req->params->{'attr'})) { 
    53         $self->{filter}{'attr'} = [ $c->req->param('attr') ]; 
    54         $self->{filter}{'attrval'} = [ $c->req->param('attrval') ]; 
    55         my @filter = $self->filter; 
    56         @objlist = $base->search_objects($otype, @filter); 
     54 
     55        if (exists($c->req->params->{'attr'})) { 
     56            $self->{filter}{'attr'} = [ $c->req->param('attr') ]; 
     57            $self->{filter}{'attrval'} = [ $c->req->param('attrval') ]; 
     58            my @filter = $self->filter; 
     59            @objlist = $base->search_objects($otype, @filter); 
     60            if ($c->req->params->{'q'}) { 
     61                @objlist = grep { $objs{$_} } @objlist; 
     62            } 
     63        } 
    5764    } else { 
    5865        @objlist = $base->list_objects($otype); 

  • trunk/LATMOS-Accounts-Web/root/html/ajax/attrvalues.tt

    r971 r1135  
    1 [% complete %] 
     1[% IF c.req.param('type') == 'select' %] 
     2<select name="toto"> 
     3<option value="">--</option> 
     4[% FOREACH v = values %] 
     5<option value="[% v | html %]">[% v | html %]</option> 
     6[% END %] 
     7</select> 
     8[% ELSE %] 
     9[% c.prototype.auto_complete_result(values) %] 
     10[% END %] 

  • trunk/LATMOS-Accounts-Web/root/html/includes/select_objects_list.tt

    r1131 r1135  
    99[% IF objectslist.size < 20 %] 
    1010[% object = c.model('Accounts').db.get_object(ofilter.otype, name) %] 
    11 <option value="[% name | html %]">[% name | html %] ([% 
    12 object.get_attributes('displayName') | html %])</option> 
     11<option value="[% name | html %]">[% name | html %] 
     12[% disp = object.get_attributes('displayName') %] 
     13[% IF disp %] 
     14([%disp | html %]) 
     15[% END %] 
     16</option> 
    1317[% ELSE %] 
    1418<option value="[% name | html %]">[% name | html %]</option> 
Note: See TracChangeset for help on using the changeset viewer.