Update of
/var/cvs/contributions/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms
In directory
james.mmbase.org:/tmp/cvs-serv32534/subsite/src/java/com/finalist/cmsc/subsite/forms
Modified Files:
Tag: b1_4
SubSiteAction.java PPContentAction.java
Log Message:
CMSC-635 - Subsite updates. Added TreeItems to Subsite and PPage.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms
See also: http://www.mmbase.org/jira/browse/CMSC-635
Index: SubSiteAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteAction.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- SubSiteAction.java 25 Feb 2008 16:26:15 -0000 1.1.2.1
+++ SubSiteAction.java 26 Feb 2008 17:04:50 -0000 1.1.2.2
@@ -26,7 +26,6 @@
import org.mmbase.bridge.NodeList;
import org.mmbase.bridge.NodeManager;
import org.mmbase.bridge.NodeQuery;
-import org.mmbase.bridge.NotFoundException;
import org.mmbase.bridge.util.Queries;
import org.mmbase.bridge.util.SearchUtil;
import org.mmbase.storage.search.Constraint;
@@ -62,8 +61,8 @@
String subsite = request.getParameter("subsite");
/* Purpose of this file
- * - retrieve List of all subsites
- * - retrieve List of pages if
+ * - retrieve list of subsites
+ * - retrieve list of pages if
* channel parameter (subsite) is given (or only 1 subsite exists)
* -> and put it in a List
*/
Index: PPContentAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/PPContentAction.java,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -b -r1.3.2.1 -r1.3.2.2
--- PPContentAction.java 25 Feb 2008 16:26:15 -0000 1.3.2.1
+++ PPContentAction.java 26 Feb 2008 17:04:50 -0000 1.3.2.2
@@ -56,8 +56,10 @@
remoteCloud = CloudManager.getCloud(cloud, "live.server");
//Retrieve Node & live-channel
- int liveNumber = Publish.getRemoteNumber(ppChannel);
- ppChannel = remoteCloud.getNode(liveNumber);
+ //int liveNumber = Publish.getRemoteNumber(ppChannel);
+ //ppChannel = remoteCloud.getNode(liveNumber);
+
+ ppChannel = Publish.getRemoteNode(ppChannel);
cloud = remoteCloud; //Use the remoteCloud from now on.
} catch (BridgeException e) {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
