Changeset 2448

Timestamp:

11/05/20 15:19:17 (4 years ago)

Author:

nanardon

Message:

Fix: ListReal? returning all userstatus instead only futur one

Location:

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

Files:

• Userstatus.pm (modified) (3 diffs)
• objects.pm (modified) (1 diff)

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

@@ -20 +20 @@
 
 sub list {
-    my ($class, $base) = @_;
+    my ($class, $base, $Real) = @_;
 
     my $sth = $base->db->prepare_cached(
@@ -27 +27 @@
               join "user" on %s."user" = "user".name
               where (%s.lastday is null or %s.lastday >= now() - '1 days'::interval)
-              %s %s
+              %s %s %s
               order by %s.%s
             },
@@ -36 +36 @@
             $base->db->quote_identifier($class->_object_table),
             $base->db->quote_identifier($class->_object_table),
+            ($Real ? 'and oalias IS NULL' : ''),
             ($base->{wexported} ? '' : 'and "user".exported = true'),
             ($base->{wexported} ? '' : 'and ' .

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

@@ -28 +28 @@
     my ($class, $base) = @_;
 
+    $class->list( $base, 'True' );
+}
+
+sub list {
+    my ($class, $base, $Real) = @_;
+
     my $sth = $base->db->prepare_cached(
         sprintf(
-            q{select %s as k from %s where internobject = false
-                and oalias IS NULL %s order by %s},
+            q{select %s as k from %s where internobject = false %s %s order by %s},
             $base->db->quote_identifier($class->_key_field),
             $base->db->quote_identifier($class->_object_table),
             ($base->{wexported} ? '' : 'and exported = true'),
-            $base->db->quote_identifier($class->_key_field),
-        )
-    );
-    $sth->execute;
-    my @keys;
-    while(my $res = $sth->fetchrow_hashref) {
-        push(@keys, $res->{k});
-    }
-    @keys
-}
-
-sub list {
-    my ($class, $base) = @_;
-
-    my $sth = $base->db->prepare_cached(
-        sprintf(
-            q{select %s as k from %s where internobject = false %s order by %s},
-            $base->db->quote_identifier($class->_key_field),
-            $base->db->quote_identifier($class->_object_table),
-            ($base->{wexported} ? '' : 'and exported = true'),
+            ($Real ? 'and oalias IS NULL' : ''),
             $base->db->quote_identifier($class->_key_field),
         )