Update of
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/java/com/finalist/cmsc/editwizard
In directory james.mmbase.org:/tmp/cvs-serv28775
Modified Files:
WizardWorkflowController.java
Log Message:
CMSC-196 Show the publish button by editwizards which are not workflow elements
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-196
Index: WizardWorkflowController.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/java/com/finalist/cmsc/editwizard/WizardWorkflowController.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- WizardWorkflowController.java 4 Nov 2008 12:02:06 -0000 1.9
+++ WizardWorkflowController.java 13 Apr 2009 02:00:23 -0000 1.10
@@ -17,6 +17,7 @@
import org.mmbase.applications.editwizard.Config;
import org.mmbase.bridge.Cloud;
import org.mmbase.bridge.Node;
+import org.mmbase.security.Rank;
import org.mmbase.util.logging.Logger;
import org.mmbase.util.logging.Logging;
@@ -112,6 +113,12 @@
log.debug("activity " + activity);
params.put("ACTIVITY", activity);
}
+ else if (isMainWizard(ewconfig, config) && elementtype != null &&
!"".equals(elementtype)
+ && !Workflow.isWorkflowType(elementtype)) {
+ if(cloud.getUser().getRank() != Rank.ADMIN) {
+ params.put("WORKFLOW", OFF);
+ }
+ }
else {
if (elementtype != null && !"".equals(elementtype) &&
Workflow.isWorkflowType(elementtype)) {
params.put("WORKFLOW", FALSE);
@@ -203,9 +210,12 @@
if (editNode != null && !Workflow.isWorkflowType(elementtype)) {
String workflowCommand = request.getParameter(WORKFLOWCOMMAND);
+ if(isMainWizard(ewconfig, wizardConfig) &&
cloud.getUser().getRank() == Rank.ADMIN) {
if (PUBLISH.equals(workflowCommand)) {
// update only nodes in live clouds.
// PublishUtil.PublishOrUpdateNode(editNode);
+ Publish.publish(editNode);
+ }
}
if (!CANCEL.equals(workflowCommand)) {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
