Author: raintang
Date: 2009-08-10 12:12:33 +0200 (Mon, 10 Aug 2009)
New Revision: 37639
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/SimpleContentUtil.java
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/java/com/finalist/cmsc/editwizard/WizardWorkflowController.java
CMSContainer/trunk/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/struts/WizardCloseAction.java
Log:
CMSC-1479 6 Based on the FD, implement create article page
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/SimpleContentUtil.java
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/SimpleContentUtil.java
2009-08-10 10:04:59 UTC (rev 37638)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/SimpleContentUtil.java
2009-08-10 10:12:33 UTC (rev 37639)
@@ -22,6 +22,7 @@
import com.finalist.cmsc.mmbase.PropertiesUtil;
import com.finalist.cmsc.security.SecurityUtil;
+import com.finalist.cmsc.security.UserRole;
public class SimpleContentUtil {
@@ -219,7 +220,8 @@
for (int i = 0; i <groups.size() ; i++) {
Node group = groups.getNode(i);
NodeList relatedChannels = group.getRelatedNodes(CONTENTCHANNEL,
MMBASEGROUPREL, SearchUtil.DESTINATION);
- if (relatedChannels.size() > 0 &&
!channels.contains(relatedChannels.getNode(0))) {
+ UserRole role = RepositoryUtil.getRole(cloud,
relatedChannels.getNode(0), false);
+ if (relatedChannels.size() > 0 &&
!channels.contains(relatedChannels.getNode(0)) && role != null &&
SecurityUtil.isWriter(role)) {
channels.add(relatedChannels.getNode(0));
}
}
Modified:
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/java/com/finalist/cmsc/editwizard/WizardWorkflowController.java
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/java/com/finalist/cmsc/editwizard/WizardWorkflowController.java
2009-08-10 10:04:59 UTC (rev 37638)
+++
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/java/com/finalist/cmsc/editwizard/WizardWorkflowController.java
2009-08-10 10:12:33 UTC (rev 37639)
@@ -72,7 +72,6 @@
params.put("WORKFLOW", TRUE);
if (TRUE.equalsIgnoreCase((String)
request.getSession().getAttribute("fromSE"))) {
params.put("WORKFLOW", FALSE);
- request.getSession().removeAttribute("fromSE");
}
params.put("WORKFLOW-ACCEPTED-ENABLED",
Boolean.toString(Workflow.isAcceptedStepEnabled()));
Modified:
CMSContainer/trunk/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/struts/WizardCloseAction.java
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/struts/WizardCloseAction.java
2009-08-10 10:04:59 UTC (rev 37638)
+++
CMSContainer/trunk/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/struts/WizardCloseAction.java
2009-08-10 10:12:33 UTC (rev 37639)
@@ -23,6 +23,7 @@
session.removeAttribute("contenttype");
session.removeAttribute("creation");
+ request.getSession().removeAttribute("fromSE");
String returnurl = request.getParameter("returnurl");
if (StringUtils.isEmpty(returnurl)) {
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
