Changeset 2273

Timestamp:

08/21/19 18:50:16 (5 years ago)

Author:

nanardon

Message:

Don't return related object twice

Location:

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

Files:

• objects.pm (modified) (1 diff)
• upgrade.pm (modified) (1 diff)

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

@@ -328 +328 @@
 
     foreach my $otype (keys %$Subotype) {
+        my %objectNames = ();
         foreach my $attr (ref $Subotype->{$otype} ? @{ $Subotype->{$otype} } : $Subotype->{$otype}) {
             my @list = $self->base->search_objects( $otype, $attr . '=' . $self->id );
-            if (@list) {
-                push(@{ $res{$otype} }, @list);
+            foreach (@list) {
+                $objectNames{ $_ } = 1;
             }
+        }
+        if (keys %objectNames) {
+            $res{$otype} = [ sort keys %objectNames ];
         }
     }

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

@@ -1352 +1352 @@
 
     if ($self->get_global_value('NeedRecomputeObject')) {
+        $self->log(LA_NOTICE, 'Object value need to be recompute, this will take a moment');
         foreach my $otype (qw(user)) {
             foreach my $name ($self->listRealObjects($otype)) {