Update of
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/java/com/finalist/cmsc/editwizard
In directory james.mmbase.org:/tmp/cvs-serv11228
Modified Files:
Tag: b1_6
WizardController.java
Log Message:
CMSC-1279 - Assets: Relate Image to content element - New search screen
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/edit-webapp/src/java/com/finalist/cmsc/editwizard
See also: http://www.mmbase.org/jira/browse/CMSC-1279
Index: WizardController.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/java/com/finalist/cmsc/editwizard/WizardController.java,v
retrieving revision 1.18.2.1
retrieving revision 1.18.2.2
diff -u -b -r1.18.2.1 -r1.18.2.2
--- WizardController.java 18 Mar 2009 04:26:44 -0000 1.18.2.1
+++ WizardController.java 8 Apr 2009 08:16:09 -0000 1.18.2.2
@@ -13,6 +13,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
+import net.sf.mmapps.modules.cloudprovider.CloudProviderFactory;
+
import org.apache.commons.lang.StringUtils;
import org.apache.struts.util.LabelValueBean;
import org.mmbase.applications.editwizard.Config;
@@ -113,8 +115,10 @@
Node node = cloud.getNode(objectnr);
if (PagesUtil.isPageType(node)) {
- creationNode = RepositoryUtil.getRootNode(cloud);
- session.setAttribute(SESSION_CREATION, "" +
creationNode.getNumber());
+ creationNode = node;
+ Cloud adminCloud =
CloudProviderFactory.getCloudProvider().getAdminCloud();
+ Node repositoryRootNode =
RepositoryUtil.getRootNode(adminCloud);;
+ session.setAttribute(SESSION_CREATION, "" +
repositoryRootNode.getNumber());
}
if (ContentElementUtil.isContentType(elementtype) ||
AssetElementUtil.isAssetType(elementtype)) {
if (RepositoryUtil.hasCreationChannel(node)) {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
