Increase domain component length limit

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

diff --git a/group.sml b/group.sml
index 5daf76c..fc72152 100644 (file)
--- a/group.sml
+++ b/group.sml
@@ -67,7 +67,7 @@ fun userInGroupName (usr, grp) =
     in
        (case C.oneOrNoRows c ($`SELECT COUNT( * )
                                    FROM Membership, WebGroup
-                                   WHERE (id = 0 OR (name = ^(C.stringToSql grp) AND grp = id))
+                                   WHERE (grp = 0 OR (name = ^(C.stringToSql grp) AND grp = id))
                                       AND usr = ^(C.intToSql usr)`) of
             SOME[x] => not (C.isNull x) andalso C.intFromSql x <> 0
           | _ => false)
@@ -83,11 +83,10 @@ fun addToGroup (mem : membership) =
        val usr = #usr mem
        val grp = #grp mem
     in
-       if userInGroupNum (usr, grp) then
-           ()
-       else
-           ignore (C.dml (getDb ()) ($`INSERT INTO Membership (grp, usr)
-                                       VALUES (^(C.intToSql grp), ^(C.intToSql usr))`))
+       case C.oneOrNoRows (getDb ()) ($`SELECT * FROM Membership WHERE grp = ^(C.intToSql grp) AND usr = ^(C.intToSql usr)`) of
+           NONE => ignore (C.dml (getDb ()) ($`INSERT INTO Membership (grp, usr)
+                                               VALUES (^(C.intToSql grp), ^(C.intToSql usr))`))
+         | SOME _ => ()
     end
 
 fun addToGroups (usr, grps) =
@@ -108,7 +107,7 @@ fun mkMembershipRow [grp, usr] =
   | mkMembershipRow row = Init.rowError ("membership", row)
 
 fun groupMembers grp =
-    C.map (getDb ()) mkUserRow ($`SELECT id, name, rname, bal, joined FROM Membership, WebUser
+    C.map (getDb ()) mkUserRow ($`SELECT id, name, rname, bal, joined, app, shares FROM Membership, WebUser
                                        WHERE grp = ^(C.intToSql grp)
                                           AND usr = id
                                        ORDER BY name`)
@@ -140,4 +139,4 @@ fun groupNameToId name =
        SOME [id] => SOME (C.intFromSql id)
       | _ => NONE
 
-end
\ No newline at end of file
+end