Merged 2.2 to HEAD

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8751 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gavin Cornwell
2008-04-14 09:33:41 +00:00
parent 9aaeac4558
commit 5dfd4e413e

View File

@@ -130,7 +130,8 @@ public class AVMSubmitPackageHandler extends JBPMSpringActionHandler implements
AlfrescoTransactionSupport.bindResource("staging_diffs", stagingDiffs); AlfrescoTransactionSupport.bindResource("staging_diffs", stagingDiffs);
// Workflow does this as system as the staging area has restricted access // Workflow does this as system as the staging area has restricted access and reviewers
// may not have permission to flatten the store the workflow was submitted from
AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<Object>() AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<Object>()
{ {
@@ -139,9 +140,6 @@ public class AVMSubmitPackageHandler extends JBPMSpringActionHandler implements
fAVMSyncService.update(stagingDiffs, null, false, false, true, true, tag, description); fAVMSyncService.update(stagingDiffs, null, false, false, true, true, tag, description);
AVMDAOs.Instance().fAVMNodeDAO.flush(); AVMDAOs.Instance().fAVMNodeDAO.flush();
fAVMSyncService.flatten(pkgPath.getSecond(), targetPath); fAVMSyncService.flatten(pkgPath.getSecond(), targetPath);
return null;
}
}, AuthenticationUtil.getSystemUserName());
// flatten source folder where changes were submitted from // flatten source folder where changes were submitted from
if (from != null && from.length() > 0) if (from != null && from.length() > 0)
@@ -155,6 +153,10 @@ public class AVMSubmitPackageHandler extends JBPMSpringActionHandler implements
AVMDAOs.Instance().fAVMNodeDAO.flush(); AVMDAOs.Instance().fAVMNodeDAO.flush();
fAVMSyncService.flatten(from, targetPath); fAVMSyncService.flatten(from, targetPath);
} }
return null;
}
}, AuthenticationUtil.getSystemUserName());
} }
/** /**