- Added delete item action to change request task dialog (means expired items can now be deleted)

- Added virtual server callback to inform it of workflow sandboxes created for change request workflow

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5693 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gavin Cornwell
2007-05-16 14:57:31 +00:00
parent b8afd326fe
commit 2c506afb17

View File

@@ -47,6 +47,7 @@ import org.alfresco.service.cmr.avmsync.AVMSyncService;
import org.alfresco.service.cmr.dictionary.TypeDefinition; import org.alfresco.service.cmr.dictionary.TypeDefinition;
import org.alfresco.service.cmr.repository.ChildAssociationRef; import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.cmr.workflow.WorkflowInstance; import org.alfresco.service.cmr.workflow.WorkflowInstance;
import org.alfresco.service.cmr.workflow.WorkflowService; import org.alfresco.service.cmr.workflow.WorkflowService;
import org.alfresco.service.cmr.workflow.WorkflowTask; import org.alfresco.service.cmr.workflow.WorkflowTask;
@@ -153,8 +154,8 @@ public class ManageTaskDialog extends BaseDialogBean
WorkflowModel.PROP_IS_SYSTEM_PACKAGE); WorkflowModel.PROP_IS_SYSTEM_PACKAGE);
LOGGER.debug("Workflow package: " + this.workflowPackage + LOGGER.debug("Workflow package: " + this.workflowPackage +
" system package: " + isSystemPackage); " system package: " + isSystemPackage);
boolean isWCMWorkflow = boolean isWCMWorkflow = (this.workflowPackage.getStoreRef().getProtocol().equals(
this.task.properties.get(AVMWorkflowUtil.PROP_FROM_PATH) != null; StoreRef.PROTOCOL_AVM));
LOGGER.debug("is wcm workflow: " + isWCMWorkflow); LOGGER.debug("is wcm workflow: " + isWCMWorkflow);
} }
} }
@@ -651,7 +652,7 @@ public class ManageTaskDialog extends BaseDialogBean
tx = Repository.getUserTransaction(context, true); tx = Repository.getUserTransaction(context, true);
tx.begin(); tx.begin();
if (this.task.properties.get(AVMWorkflowUtil.PROP_FROM_PATH) != null) if (this.workflowPackage.getStoreRef().getProtocol().equals(StoreRef.PROTOCOL_AVM))
{ {
final NodeRef stagingNodeRef = (NodeRef) final NodeRef stagingNodeRef = (NodeRef)
this.nodeService.getProperty(this.workflowPackage, this.nodeService.getProperty(this.workflowPackage,