Changeset 2407

Timestamp:

06/23/20 00:45:43 (4 years ago)

Author:

nanardon

Message:

Fix: groupOfName list when no member are exported

File:

• trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/Groupofnames.pm (modified) (3 diffs)

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

@@ -31 +31 @@
 sub _has_extended_attributes { 1 }
 
+sub listReal {
+    my ($class, $base) = @_;
+
+    my $sth = $base->db->prepare_cached(
+        sprintf(
+            q{select name as k from "group" where oalias IS NULL and internobject = false %s
+              and ikey in (
+                SELECT okey from group_attributes_users
+                join "user" on group_attributes_users.value = "user".name
+                where attr = 'memberUID' %s
+                )
+              order by name
+            },
+            ($base->{wexported} ? '' : 'and exported = true'),
+            ($base->{wexported} ? '' : 'and "user".exported = true'),
+        )
+    );
+    $sth->execute;
+    my @keys;
+    while(my $res = $sth->fetchrow_hashref) {
+        push(@keys, $res->{k});
+    }
+    @keys
+}
+
 sub list {
     my ($class, $base) = @_;
@@ -37 +62 @@
         sprintf(
             q{select name as k from "group" where internobject = false %s
-              and ikey in ( SELECT okey from group_attributes_users where attr = 'memberUID' )
+              and ikey in (
+                SELECT okey from group_attributes_users
+                join "user" on group_attributes_users.value = "user".name
+                where attr = 'memberUID' %s
+                )
               order by name
             },
             ($base->{wexported} ? '' : 'and exported = true'),
+            ($base->{wexported} ? '' : 'and "user".exported = true'),
         )
     );
@@ -57 +87 @@
             q{select name as k from "group" where internobject = false %s
               and rev > ? and oalias IS NULL
-              and ikey in ( SELECT okey from group_attributes_users where attr = 'memberUID' )
+              and ikey in (
+                SELECT okey from group_attributes_users
+                join "user" on group_attributes_users.value = "user".name
+                where attr = 'memberUID' %s
+                )
               order by name
             },
             ($base->{wexported} ? '' : 'and exported = true'),
+            ($base->{wexported} ? '' : 'and "user".exported = true'),
         )
     );