inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V2.1 to HEAD

Browse Source 
6500: Office 2003 Add-ins: Fix for AWC-1505
   6501: Fix for AWC-1361
   6502: Fixes for locking issues regrading expired content
   6503: Fix for AR-1615
   6504: WCM-444, WCM-288, WCM-735, WCM-480
   6505: WCM-498 wasn't fully fixed
   6506: Fix for AWC-1462
   6507: Fix for WCM-741 (link validation report for staging sandbox can get stuck)
   6508: AR-1650: WS Unit tests fail
   6509: Fix for WCM-751 which also solves WCM-570 - also fixed issue to allow deletion of any "broken" webprojects created due to either of those bugs.
   6510: Fix for WCM-546 (workflow history panel should be expanded by default)
   6511: Fix AWC-1128
   6512: Fixes to several to a couple of bugs found under concurrent load.
   6513: Build fix for test using an invalid noderef (now stripped out as it does not exist)
   6514: Add support for the QueryFile transact request to the IPC$ named pipe handler. Fix for AR-1687.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6740 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2007-09-10 23:30:53 +00:00
parent cc218b118e
commit 6e5ac9d831
15 changed files with 170 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
source/java/org/alfresco/web/bean/wcm/ManageChangeRequestTaskDialog.java
View File

@@ -37,6 +37,8 @@ import org.alfresco.model.WCMModel;
import org.alfresco.repo.avm.AVMNodeConverter;
import org.alfresco.sandbox.SandboxConstants;
import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
import org.alfresco.service.cmr.avm.locking.AVMLock;
import org.alfresco.service.cmr.avm.locking.AVMLockingService;
import org.alfresco.service.cmr.avmsync.AVMDifference;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.namespace.QName;
@@ -61,6 +63,7 @@ public class ManageChangeRequestTaskDialog extends ManageTaskDialog
{
protected boolean doResubmitNow = false;
protected AVMBrowseBean avmBrowseBean;
protected AVMLockingService avmLockingService;
private final static Log logger = LogFactory.getLog(ManageChangeRequestTaskDialog.class);
@@ -110,6 +113,11 @@ public class ManageChangeRequestTaskDialog extends ManageTaskDialog
tx = Repository.getUserTransaction(context);
tx.begin();
// get the current username and place in list
String username = Application.getCurrentUser(context).getUserName();
List<String> newLockOwners = new ArrayList<String>(1);
newLockOwners.add(username);
// prepare the edited parameters for saving
Map<QName, Serializable> params = WorkflowUtil.prepareTaskParams(this.taskNode);
@@ -125,23 +133,51 @@ public class ManageChangeRequestTaskDialog extends ManageTaskDialog
String targetPath = pkgDesc.getIndirection();
List<AVMDifference> diffs = this.avmSyncService.compare(pkgPath.getFirst(),
pkgPath.getSecond(), -1, targetPath, null);
for (AVMDifference diff : diffs)
{
AVMNodeDescriptor node = this.avmService.lookup(diff.getDestinationVersion(),
diff.getDestinationPath(), true);
if (node != null)
{
submitNodes.add(node);
submitPaths.add(diff.getDestinationPath());
}
}
// update the users main store with the changes from the workflow store
this.avmSyncService.update(diffs, null, false, false, true, true, null, null);
// move locks
for (AVMDifference diff : diffs)
{
String sourcePath = diff.getSourcePath();
String destPath = diff.getDestinationPath();
// move the lock for this path from the user workflow sandbox to the users main store
AVMLock lock = this.avmLockingService.getLock(AVMUtil.getStoreId(sourcePath),
AVMUtil.getStoreRelativePath(sourcePath));
if (lock != null)
{
this.avmLockingService.modifyLock(AVMUtil.getStoreId(sourcePath),
AVMUtil.getStoreRelativePath(sourcePath), null,
AVMUtil.getStoreName(destPath), lock.getOwners(),
newLockOwners);
if (logger.isDebugEnabled())
{
logger.debug("Moved lock: " + lock + " to: " +
this.avmLockingService.getLock(AVMUtil.getStoreId(destPath),
AVMUtil.getStoreRelativePath(destPath)));
}
}
}
// re-submit all the items now if requested
if (this.doResubmitNow)
{
for (AVMDifference diff : diffs)
{
String destPath = diff.getDestinationPath();
AVMNodeDescriptor node = this.avmService.lookup(diff.getDestinationVersion(),
destPath, true);
if (node != null)
{
submitNodes.add(node);
submitPaths.add(destPath);
}
}
setupSubmitDialog(context, submitPaths, submitNodes);
}
@@ -191,6 +227,13 @@ public class ManageChangeRequestTaskDialog extends ManageTaskDialog
this.avmBrowseBean = avmBrowseBean;
}
/**
* @param avmLockingService The AVMLockingService instance
*/
public void setAvmLockingService(AVMLockingService avmLockingService)
{
this.avmLockingService = avmLockingService;
}
// ------------------------------------------------------------------------------
// Helper methods