[cvs] expresso commit by lhamel: revert last change

[JCorporate Ltd]

Log Message:
-----------
revert last change

Modified Files:
--------------
    expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj:
        RowSecuredDBObject.java

Revision Data
-------------
Index: RowSecuredDBObject.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/RowSecuredDBObject.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/RowSecuredDBObject.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/RowSecuredDBObject.java -u -r1.37 -r1.38
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/RowSecuredDBObject.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/RowSecuredDBObject.java
@@ -575,8 +575,7 @@
             List groups = this.getAdministrateGroups();
 
             // intersection of two groups is retained
-            List memberships = getAugmentedGroupList(user);
-            groups.retainAll(memberships);
+            groups.retainAll(user.getGroups());
             result = groups.size() > 0;
         }
 
@@ -628,8 +627,7 @@
             /**
              * @todo rewrite as a multidbobject join
              */
-            List memberships = getAugmentedGroupList(user);
-            groups.retainAll(memberships);
+            groups.retainAll(user.getGroups());
             result = groups.size() > 0;
         }
 
@@ -637,18 +635,6 @@
     }
 
     /**
-     * augment a user's group list with the All Users group, if necessary.
-     */
-    private List getAugmentedGroupList(User user) throws DBException {
-        List memberships = user.getGroups();
-        if ( !memberships.contains(UserGroup.ALL_USERS_GROUP)
-                && !user.getLoginName().equals(User.UNKNOWN_USER)) {
-            memberships.add(UserGroup.ALL_USERS_GROUP);
-        }
-        return memberships;
-    }
-
-    /**
      * @return true if requesting id has permission to write
      * @throws DBException upon database communication error
      */
@@ -687,8 +673,7 @@
             List groups = this.getWriteGroups();
 
             // intersection of two groups is retained
-            List memberships = getAugmentedGroupList(user);
-            groups.retainAll(memberships);
+            groups.retainAll(user.getGroups());
             result = groups.size() > 0;
         }