Commits

David Chui  committed 008ec2e Merge

[maven-release-plugin] copy for tag confluence-userlister-plugin-2.4

  • Participants
  • Parent commits 87a6709, 400c82a

Comments (0)

Files changed (2)

         <developerConnection>scm:svn:https://svn.atlassian.com/svn/public/contrib/confluence/confluence-userlister-plugin/tags/confluence-userlister-plugin-2.4</developerConnection>
         <url>http://svn.atlassian.com/fisheye/browse/public/contrib/confluence/confluence-userlister-plugin/tags/confluence-userlister-plugin-2.4</url>
     </scm>
-</project>
+</project>

File src/main/java/com/atlassian/confluence/extra/userlister/UserLister.java

 import com.atlassian.renderer.v2.macro.BaseMacro;
 import com.atlassian.renderer.v2.macro.MacroException;
 import com.atlassian.user.Group;
+import com.atlassian.user.search.page.Pager;
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 
     {
         //1. parse parameters from macro
         String groupNames = StringUtils.defaultString((String) parameters.get("groups"), (String) parameters.get("group"));
-        boolean returnOnlineUsers = Boolean.parseBoolean(StringUtils.defaultString(StringUtils.trim((String) parameters.get("online"))));
+        boolean returnOnlineUsers = Boolean.valueOf(StringUtils.defaultString(StringUtils.trim((String) parameters.get("online")))).booleanValue();
         Boolean showWarning = Boolean.valueOf(StringUtils.defaultString(StringUtils.trim((String) parameters.get("showWarning")), "true"));
         
         if(StringUtils.isBlank(groupNames))
          */
         if (groups.contains(UserList.ALL_GROUP_NAME))
         {
-            List groupsExpanded = userAccessor.getGroupsAsList(AuthenticatedUserThreadLocal.getUser());
-            for (Iterator i = groupsExpanded.iterator(); i.hasNext();)
+            Pager filteredExpandedGroups = userAccessor.filterUnaccessibleGroups(userAccessor.getGroups(), AuthenticatedUserThreadLocal.getUser());
+            for (Iterator i = filteredExpandedGroups.iterator(); i.hasNext();)
                 groups.add(((Group) i.next()).getName());
 
             /* Then remove the wildcard */