Changeset 35298 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/UserQueryResult.java

Timestamp:

2021-08-16T20:17:05+12:00 (3 years ago)

Author:

anupama

Message:

Working version of hierarchical groups: now the usersDB stores expandedGroups instead of user-entered groups in the 'roles' table. The expandedGroups listing is therefore now consulted behind-the-scenes/automatically by HttpServletRequest.isUserInRole(), which is configured (in tomcat servlet configuration file greenstone3.xml) to query the roles table of the userDB. The new UserTermInfo.compactGroups() function takes care that the display value of the groups listing in the administration pages is the compacted version: it's not exactly the same as the user-entered value as the compactedGroups listing is in natural (alphabetic/ASCII) order and with duplicates removed.

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/UserQueryResult.java (modified) (1 diff)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/UserQueryResult.java

@@ -37 +37 @@
     }
 
-    public void addUserTerm(String username, String password, String groups, String accountstatus, String comment, String email)
+    public void addUserTerm(String username, String password, String expandedGroups, String accountstatus, String comment, String email)
     {
-        UserTermInfo ui = new UserTermInfo(username, password, groups,
+        UserTermInfo ui = new UserTermInfo(username, password, expandedGroups,
                            accountstatus, comment, email);      
         users.add(ui);