Update of
/var/cvs/contributions/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/tree
In directory
james.mmbase.org:/tmp/cvs-serv26739/subsite/src/java/com/finalist/cmsc/subsite/tree
Modified Files:
PersonalPageTreeItemRenderer.java SubSiteTreeItemRenderer.java
Log Message:
CMSC-635 - Subsite updates. Improved PublishService. Added TreeItems to Subsite
and PPage.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/tree
See also: http://www.mmbase.org/jira/browse/CMSC-635
Index: PersonalPageTreeItemRenderer.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/tree/PersonalPageTreeItemRenderer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- PersonalPageTreeItemRenderer.java 4 Jan 2008 16:51:41 -0000 1.4
+++ PersonalPageTreeItemRenderer.java 26 Feb 2008 12:18:09 -0000 1.5
@@ -19,6 +19,7 @@
import com.finalist.cmsc.security.UserRole;
import com.finalist.tree.TreeElement;
import com.finalist.tree.TreeModel;
+import com.finalist.util.module.ModuleUtil;
public class PersonalPageTreeItemRenderer implements
NavigationTreeItemRenderer {
@@ -52,6 +53,13 @@
*/
}
+ if (SecurityUtil.isWebmaster(role) &&
ModuleUtil.checkFeature(SubSiteTreeItemRenderer.FEATURE_WORKFLOW)) {
+ element.addOption(renderer.createTreeOption("publish.png",
"site.page.publish",
+ "../workflow/publish.jsp?number=" + id));
+ element.addOption(renderer.createTreeOption("masspublish.png",
"site.page.masspublish",
+ "../workflow/masspublish.jsp?number=" + id));
+ }
+
element.addOption(renderer.createTreeOption("rights.png",
"site.page.rights",
"../usermanagement/pagerights.jsp?number=" + id));
@@ -64,7 +72,7 @@
}
public boolean showChildren(Node parentNode) {
- return true;
+ return false;
}
}
Index: SubSiteTreeItemRenderer.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/tree/SubSiteTreeItemRenderer.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- SubSiteTreeItemRenderer.java 18 Feb 2008 13:33:42 -0000 1.9
+++ SubSiteTreeItemRenderer.java 26 Feb 2008 12:18:09 -0000 1.10
@@ -19,11 +19,13 @@
import com.finalist.cmsc.security.UserRole;
import com.finalist.tree.TreeElement;
import com.finalist.tree.TreeModel;
+import com.finalist.util.module.ModuleUtil;
public class SubSiteTreeItemRenderer implements NavigationTreeItemRenderer {
private static final String RESOURCEBUNDLE = "cmsc-modules-subsite";
+ protected static final String FEATURE_WORKFLOW = "workflowitem";
public TreeElement getTreeElement(NavigationRenderer renderer, Node
parentNode, TreeModel model) {
Node parentParentNode = NavigationUtil.getParent(parentNode);
@@ -70,6 +72,13 @@
*/
}
+ if (SecurityUtil.isWebmaster(role) &&
ModuleUtil.checkFeature(FEATURE_WORKFLOW)) {
+ element.addOption(renderer.createTreeOption("publish.png",
"site.page.publish",
+ "../workflow/publish.jsp?number=" + id));
+ element.addOption(renderer.createTreeOption("masspublish.png",
"site.page.masspublish",
+ "../workflow/masspublish.jsp?number=" + id));
+ }
+
element.addOption(renderer.createTreeOption("rights.png",
"site.page.rights",
"../usermanagement/pagerights.jsp?number=" + id));
@@ -83,7 +92,7 @@
}
public boolean showChildren(Node parentNode) {
- return true;//Do not show PersonalPages
+ return false; //Do not show PersonalPages
}
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
