From e38fe5b0e18be227d05b0071de8773d4b8c02236 Mon Sep 17 00:00:00 2001 From: Adam Chlipala Date: Sun, 6 Apr 2008 13:41:58 +0000 Subject: [PATCH] Ignore retired members in dynamic geographic location pages --- location.sml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/location.sml b/location.sml index 616fd6c..f59059a 100644 --- a/location.sml +++ b/location.sml @@ -102,7 +102,7 @@ fun countResidents () = addToParents (#loc lives, count) end in - C.fold db folder NM.empty ($`SELECT loc, usr FROM Lives`) + C.fold db folder NM.empty ($`SELECT loc, usr FROM Lives JOIN WebUserActive ON usr = id`) end fun recordResidents () = @@ -136,7 +136,7 @@ fun recordResidents () = end in C.fold db folder NM.empty ($`SELECT loc, id, name, rname, bal, joined, app, shares, paypal, checkout - FROM Lives JOIN WebUser ON usr = id`) + FROM Lives JOIN WebUserActive ON usr = id`) end fun residents loc = @@ -294,7 +294,7 @@ fun removeFromLocation (lives : lives) = fun residentsOneLevel loc = C.map (getDb ()) mkUserRow ($`SELECT id, name, rname, bal, joined, app, shares, paypal, checkout - FROM Lives, WebUser + FROM Lives, WebUserActive WHERE loc = ^(C.intToSql loc) AND usr = id ORDER BY name`) -- 2.20.1