Move old member add form to a separate page

[hcoop/zz_old/portal.git] / balance.sml

diff --git a/balance.sml b/balance.sml
index 9943944..1b715fa 100644 (file)
--- a/balance.sml
+++ b/balance.sml
@@ -52,6 +52,9 @@ fun listOwnedBalances () =
                                     FROM Balance JOIN WebUser
                                        ON Balance.name = WebUser.name
                                           AND WebUser.bal = Balance.id
+                                    JOIN Membership
+                                       ON Membership.grp = 1
+                                          AND Membership.usr = WebUser.id
                                     ORDER BY Balance.name`)
 
 fun listUnownedBalances () =
@@ -59,7 +62,11 @@ fun listUnownedBalances () =
                                     FROM Balance LEFT OUTER JOIN WebUser
                                        ON Balance.name = WebUser.name
                                           AND WebUser.bal = Balance.id
+                                    LEFT OUTER JOIN Membership
+                                       ON Membership.grp = 1
+                                          AND Membership.usr = WebUser.id
                                     WHERE WebUser.id IS NULL
+                                       OR Membership.grp IS NULL
                                     ORDER BY Balance.name`)
 
 fun validBalanceName name =