Changeset 1904

Timestamp:

01/03/17 19:55:53 (7 years ago)

Author:

nanardon

Message:

Don't poupulate alias and group with object alias

Location:

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql

Files:

• Aliases.pm (modified) (2 diffs)
• Group.pm (modified) (1 diff)

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/Aliases.pm

@@ -275 +275 @@
 
     if (my $filter = $self->get_field('autoMemberFilter')) {
-        $users{$_} = 1 foreach( $self->base->search_objects('user', ref $filter ? @{ $filter } : $filter) );
+        $users{$_} = 1 foreach( $self->base->search_objects(
+                'user',
+                'oalias=NULL',
+                ref $filter ? @{ $filter } : $filter)
+        );
     }
 
@@ -281 +285 @@
         my @suTypeFilter = map { "sutype=$_" } (ref $filter ? @{ $filter } : $filter);
         foreach my $group ($self->base->search_objects('group', @suTypeFilter)) {
-            foreach ($self->base->search_objects('user', "memberOf=$group")) {
+            foreach ($self->base->search_objects('user', 'oalias=NULL', "memberOf=$group")) {
                 $users{$_} = 1;
             }

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/Group.pm

@@ -254 +254 @@
         foreach ($self->base->search_objects(
                 'user',
+                'oalias=NULL',
                 ref $filter ? @{ $filter } : $filter)) {
             $users{$_} = 1;