Author: jkoster
Date: 2009-05-12 13:31:59 +0200 (Tue, 12 May 2009)
New Revision: 35084
Modified:
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/RepositoryUtil.java
CMSContainer/branches/b1_5/CMSContainer/cmsc/security/src/webapp/editors/usermanagement/userlist.jsp
CMSContainer/branches/b1_5/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/NavigationUtil.java
Log:
CMSC-1399 - Content Roles overview and Site Roles overview tree did not expand
leaves as expected; Also improved the user list: align the list a bit to the
left.
Modified:
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/RepositoryUtil.java
===================================================================
---
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/RepositoryUtil.java
2009-05-12 10:22:25 UTC (rev 35083)
+++
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/RepositoryUtil.java
2009-05-12 11:31:59 UTC (rev 35084)
@@ -975,7 +975,10 @@
TreeMap<String,UserRole> channelsWithRole =
SecurityUtil.getRoleMap(treeManagers, CHILDREL, group);
for (String path : channelsWithRole.keySet()) {
Node channel = getChannelFromPath(cloud, path);
- info.expand(channel.getNumber());
+ List <Node> pathNodes = getPathToRoot(channel);
+ for (Node node : pathNodes) {
+ info.expand(node.getNumber());
+ }
}
return info;
}
Modified:
CMSContainer/branches/b1_5/CMSContainer/cmsc/security/src/webapp/editors/usermanagement/userlist.jsp
===================================================================
---
CMSContainer/branches/b1_5/CMSContainer/cmsc/security/src/webapp/editors/usermanagement/userlist.jsp
2009-05-12 10:22:25 UTC (rev 35083)
+++
CMSContainer/branches/b1_5/CMSContainer/cmsc/security/src/webapp/editors/usermanagement/userlist.jsp
2009-05-12 11:31:59 UTC (rev 35084)
@@ -17,7 +17,7 @@
</ul>
<div style="clear:both; height:10px;"></div>
- <table style="position:relative;left:40px;">
+ <table style="margin-left:20px;">
<tr>
<td><b><fmt:message key="group.name" /></b></td>
</tr>
@@ -57,7 +57,7 @@
</ul>
<div style="clear:both; height:10px;"></div>
- <table style="position:relative;left:40px;">
+ <table style="margin-left:20px;">
<tr>
<td><b><fmt:message key="user.account"
/></b></td>
<td><b><fmt:message key="user.name" /></b></td>
Modified:
CMSContainer/branches/b1_5/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/NavigationUtil.java
===================================================================
---
CMSContainer/branches/b1_5/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/NavigationUtil.java
2009-05-12 10:22:25 UTC (rev 35083)
+++
CMSContainer/branches/b1_5/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/NavigationUtil.java
2009-05-12 11:31:59 UTC (rev 35084)
@@ -471,7 +471,10 @@
TreeMap<String,UserRole> pagesWithRole =
SecurityUtil.getRoleMap(treeManagers, NAVREL, group);
for (String path : pagesWithRole.keySet()) {
Node page = getPageFromPath(cloud, path);
- info.expand(page.getNumber());
+ List <Node> pathNodes = getPathToRoot(page);
+ for (Node node : pathNodes) {
+ info.expand(node.getNumber());
+ }
}
return info;
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
