Update of
/var/cvs/contributions/CMSContainer_Modules/alias/src/java/com/finalist/cmsc/alias/tree
In directory
james.mmbase.org:/tmp/cvs-serv17728/alias/src/java/com/finalist/cmsc/alias/tree
Modified Files:
AliasTreeItemRenderer.java
Log Message:
CMSC-924 fixed and some other minor stuff
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/alias/src/java/com/finalist/cmsc/alias/tree
See also: http://www.mmbase.org/jira/browse/CMSC-924
Index: AliasTreeItemRenderer.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/alias/src/java/com/finalist/cmsc/alias/tree/AliasTreeItemRenderer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- AliasTreeItemRenderer.java 26 Mar 2008 14:04:05 -0000 1.4
+++ AliasTreeItemRenderer.java 23 May 2008 14:57:30 -0000 1.5
@@ -30,14 +30,16 @@
Node parentParentNode = NavigationUtil.getParent(parentNode);
UserRole role = NavigationUtil.getRole(parentNode.getCloud(),
parentParentNode, false);
+ TreeElement element = null;
+ String id = null;
+
NodeList parentParentAliasses =
parentParentNode.getRelatedNodes("pagealias");
if(parentParentAliasses.size() >= 5) {
if(parentNode.getNumber() ==
parentParentAliasses.getNode(0).getNumber()) {
String icon = renderer.getIcon("pagealias_stacked",
role);
String label = parentParentAliasses.size()+"
"+renderer.getLabel("site.alias.stacked", RESOURCEBUNDLE);
- TreeElement element = renderer.createElement(icon, "",
label, label, "../alias/stacked.jsp?parent="+parentParentNode.getNumber(),
"content");
-
- return element;
+ element = renderer.createElement(icon, "", label,
label, "../alias/stacked.jsp?parent="+parentParentNode.getNumber(), "content");
+ id = ""+parentParentNode.getNumber();
}
else {
return null;
@@ -47,8 +49,8 @@
String name = parentNode.getStringValue(AliasUtil.TITLE_FIELD);
String fragment = parentNode.getStringValue(
NavigationUtil.getFragmentFieldname(parentNode) );
- String id = String.valueOf(parentNode.getNumber());
- TreeElement element = renderer.createElement(parentNode, role,
name, fragment, false);
+ id = String.valueOf(parentNode.getNumber());
+ element = renderer.createElement(parentNode, role, name,
fragment, false);
if (SecurityUtil.isEditor(role)) {
element.addOption(renderer.createTreeOption("edit_defaults.png",
"site.alias.edit",
@@ -70,12 +72,12 @@
"../workflow/publish.jsp?number=" + id));
}
+ }
element.addOption(renderer.createTreeOption("rights.png",
"site.page.rights",
"../usermanagement/pagerights.jsp?number=" + id));
return element;
}
- }
public void addParentOption(NavigationRenderer renderer, TreeElement
element, String parentId) {
element.addOption(renderer.createTreeOption("alias_new.png",
"site.alias.new",
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
