From: adamch <adamch>
Date: Thu, 13 Sep 2007 19:03:28 +0000 (+0000)
Subject: Move old member add form to a separate page
X-Git-Url: http://git.hcoop.net/hcoop/zz_old/portal.git/commitdiff_plain/ef48ed9eaeea982b8580c44c0027edff6abde4d8

Move old member add form to a separate page
---

diff --git a/balance.sml b/balance.sml
index 9943944..1b715fa 100644
--- 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 =
diff --git a/users.mlt b/users.mlt
index b192d19..f7de949 100644
--- a/users.mlt
+++ b/users.mlt
@@ -74,9 +74,8 @@ elseif $"mod" <> "" then
 	Init.grandfatherUsers()
 	%><h3>Grandfathered</h3>
 
-<% end %>
-
-<% if showNormal then %>
+<% elseif $"cmd" = "addform" then
+        showNormal := false %>        
 <h3>New member</h3>
 
 <form action="users" method="post">
@@ -101,6 +100,12 @@ elseif $"mod" <> "" then
 </table>
 </form>
 
+<% end %>
+
+<% if showNormal then %>
+
+<a href="users?cmd=addform">Add a user manually</a><br>
+
 <h3>Manage current members</h3>
 
 <table>