cmailleux 2005/11/29 15:09:42 CET
Modified files:
core/src/java/org/jahia/workflow/nstep NStepWorkflow.java
Log:
Avoid using jParams to get the group
Revision Changes Path
1.12 +22 -13
jahia/core/src/java/org/jahia/workflow/nstep/NStepWorkflow.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/workflow/nstep/NStepWorkflow.java.diff?r1=1.11&r2=1.12&f=h
Index: NStepWorkflow.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/workflow/nstep/NStepWorkflow.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- NStepWorkflow.java 22 Nov 2005 18:01:45 -0000 1.11
+++ NStepWorkflow.java 29 Nov 2005 14:09:41 -0000 1.12
@@ -3,26 +3,28 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jahia.bin.Jahia;
+import org.jahia.content.ContentObject;
+import org.jahia.content.ContentPageKey;
+import org.jahia.content.ObjectKey;
import org.jahia.exceptions.JahiaException;
import org.jahia.hibernate.manager.SpringContextSingleton;
import org.jahia.params.ProcessingContext;
-import org.jahia.services.usermanager.JahiaUser;
-import org.jahia.services.usermanager.JahiaGroup;
-import org.jahia.services.workflow.ExternalWorkflow;
-import org.jahia.services.workflow.WorkflowService;
+import org.jahia.registries.ServicesRegistry;
import org.jahia.services.importexport.ProductionJob;
+import org.jahia.services.mail.MailService;
+import org.jahia.services.pages.ContentPage;
import org.jahia.services.scheduler.SchedulerService;
-import org.jahia.services.version.EntryLoadRequest;
+import org.jahia.services.usermanager.JahiaGroup;
+import org.jahia.services.usermanager.JahiaUser;
import org.jahia.services.version.ActivationTestResults;
-import org.jahia.services.version.StateModificationContext;
+import org.jahia.services.version.EntryLoadRequest;
import org.jahia.services.version.JahiaVersionService;
-import org.jahia.services.mail.MailService;
+import org.jahia.services.version.StateModificationContext;
+import org.jahia.services.workflow.ExternalWorkflow;
+import org.jahia.services.workflow.WorkflowService;
+import org.jahia.workflow.nstep.model.Workflow;
import org.jahia.workflow.nstep.model.WorkflowInstance;
import org.jahia.workflow.nstep.model.WorkflowStep;
-import org.jahia.workflow.nstep.model.Workflow;
-import org.jahia.registries.ServicesRegistry;
-import org.jahia.content.ObjectKey;
-import org.jahia.content.ContentObject;
import org.springframework.context.ApplicationContext;
import org.springframework.orm.ObjectRetrievalFailureException;
import org.springframework.transaction.PlatformTransactionManager;
@@ -42,13 +44,16 @@
* Time: 14:53:40
*
* @author [EMAIL PROTECTED]
- * @version $Id: NStepWorkflow.java,v 1.11 2005/11/22 18:01:45 cmailleux Exp
$
+ * @version $Id: NStepWorkflow.java,v 1.12 2005/11/29 14:09:41 cmailleux Exp
$
* <p/>
* Revision log :
* $Log: NStepWorkflow.java,v $
+ * Revision 1.12 2005/11/29 14:09:41 cmailleux
+ * Avoid using jParams to get the group
+ *
* Revision 1.11 2005/11/22 18:01:45 cmailleux
- * Add transactions to nstepWorkflow
- * Export with files in production
+ * Add transactions to nstepWorkflow
+ * Export with files in production
* COrrectly flush caches when moving
*
* Revision 1.10 2005/10/27 14:44:32 cmailleux
@@ -308,7 +313,7 @@
final org.jahia.workflow.nstep.model.WorkflowStep workflowStep =
((WorkflowStep) steps.get(startIndex));
final WorkflowService workflowService =
ServicesRegistry.getInstance().getWorkflowService();
try {
- JahiaGroup group =
workflowService.getRoleGroup(jParams.getContentPage(),
+ JahiaGroup group =
workflowService.getRoleGroup(ContentPage.getContentObjectInstance(ContentPageKey.getInstance(objectKey)),
trimActionName(workflowStep.getName()), true);
if (group.isMember(jParams.getUser())) {
// avoid rollback on first two step
@@ -324,6 +329,8 @@
}
} catch (JahiaException e) {
log.warn("Error during eval of available actions", e);
+ } catch (ClassNotFoundException e) {
+ log.warn("Error during eval of available actions", e);
}
return list;
}
