Update of
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/java/com/finalist/cmsc/editwizard
In directory james.mmbase.org:/tmp/cvs-serv24484
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
retrieving revision 1.18.2.1
diff -u -b -r1.18 -r1.18.2.1
--- WizardController.java 5 Feb 2009 12:04:15 -0000 1.18
+++ WizardController.java 18 Mar 2009 04:26:44 -0000 1.18.2.1
@@ -25,30 +25,21 @@
import org.mmbase.util.logging.Logger;
import org.mmbase.util.logging.Logging;
-import com.finalist.cmsc.mmbase.RelationUtil;
import com.finalist.cmsc.navigation.NavigationUtil;
import com.finalist.cmsc.navigation.PagesUtil;
import com.finalist.cmsc.repository.AssetElementUtil;
import com.finalist.cmsc.repository.ContentElementUtil;
import com.finalist.cmsc.repository.RepositoryUtil;
import com.finalist.cmsc.security.Role;
-import com.finalist.cmsc.security.SecurityUtil;
import com.finalist.cmsc.security.UserRole;
import com.finalist.cmsc.services.versioning.Versioning;
import com.finalist.cmsc.services.versioning.VersioningException;
-import com.finalist.cmsc.services.workflow.Workflow;
/**
* @author Nico Klasens This class contains code which extends wizard.jsp
*/
public class WizardController {
- private static final String DESTINATION = "destination";
-
- private static final String OWNERREL = "ownerrel";
-
- private static final String USER = "user";
-
/**
* MMbase logging system
*/
@@ -122,7 +113,7 @@
Node node = cloud.getNode(objectnr);
if (PagesUtil.isPageType(node)) {
- creationNode = node;
+ creationNode = RepositoryUtil.getRootNode(cloud);
session.setAttribute(SESSION_CREATION, "" +
creationNode.getNumber());
}
if (ContentElementUtil.isContentType(elementtype) ||
AssetElementUtil.isAssetType(elementtype)) {
@@ -269,19 +260,21 @@
if(ContentElementUtil.getAuthor(node) == null){
node.commit();
}
- // NodeManager ownerManager = cloud.getNodeManager(USER);
- // int owners = node.countRelatedNodes(ownerManager,
OWNERREL, DESTINATION);
- // if (owners < 1) {
- // RelationUtil.createRelation(node,
SecurityUtil.getUserNode(cloud), OWNERREL);
- // }
-
-// if (!Workflow.hasWorkflow(node)) {
-// Workflow.create(node, "");
-// }
-// else
-// {
-// Workflow.addUserToWorkflow(node);
-// }
+ /*
+ NodeManager ownerManager = cloud.getNodeManager(USER);
+ int owners = node.countRelatedNodes(ownerManager,
OWNERREL, DESTINATION);
+ if (owners < 1) {
+ RelationUtil.createRelation(node,
SecurityUtil.getUserNode(cloud), OWNERREL);
+ }
+
+ if (!Workflow.hasWorkflow(node)) {
+ Workflow.create(node, "");
+ }
+ else
+ {
+ Workflow.addUserToWorkflow(node);
+ }
+ */
//add version for asset element
try {
Versioning.addVersion(node);
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
