Changeset 830

Timestamp:

03/17/10 13:24:25 (14 years ago)

Author:

nanardon

Message:

• don't list secondaries address when user are no longer exported and unexported objects are not wanted

File:

• LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/Onlyaddress.pm (modified) (1 diff)

LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/Onlyaddress.pm

@@ -13 +13 @@
     my $sth = $base->db->prepare_cached(
         sprintf(
-            q{select %s as k from %s where ikey not in (select okey from %s where attr = 'isMainAddress') %s order by %s},
+            q{select %s.%s as k from %s
+              join "user" on %s."user" = "user".name %s
+              where %s.ikey not in (select okey from %s where attr = 'isMainAddress') %s
+              order by %s.%s
+            },
+            $base->db->quote_identifier($class->object_table),
             $base->db->quote_identifier($class->key_field),
             $base->db->quote_identifier($class->object_table),
+            $base->db->quote_identifier($class->object_table),
+            ($base->{wexported} ? '' : 'and "user".exported = true'),
+            $base->db->quote_identifier($class->object_table),
             $base->db->quote_identifier($class->object_table. '_attributes'), # attr
-            ($base->{wexported} ? '' : 'and exported = true'),
+            ($base->{wexported} ? '' : 'and ' .
+                $base->db->quote_identifier($class->object_table) . '.exported = true'),
+            $base->db->quote_identifier($class->object_table),
             $base->db->quote_identifier($class->key_field),
         )