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

This checkin does two things:

Browse Source 
1. Refines the semantics of ghost creation, so that they only appear when
warranted.
2. Implements a mechanism for filtering out files which should not appear in comparison
results or be pushed along by updates.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4525 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2006-12-05 22:26:02 +00:00
parent ae4d6a0fd2
commit f5f4a867f7
4 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/java/org/alfresco/web/bean/wcm/SubmitDialog.java
View File

@@ -335,7 +335,8 @@ public class SubmitDialog extends BaseDialogBean
{
String userStore = this.avmBrowseBean.getSandbox() + ":/";
String stagingStore = this.avmBrowseBean.getStagingStore() + ":/";
List<AVMDifference> diffs = avmSyncService.compare(-1, userStore, -1, stagingStore);
// TODO Pass the globalPathExcluder NameMatcher instead of null.
List<AVMDifference> diffs = avmSyncService.compare(-1, userStore, -1, stagingStore, null);
selected = new ArrayList<AVMNodeDescriptor>(diffs.size());
for (AVMDifference diff : diffs)
{
@@ -426,7 +427,7 @@ public class SubmitDialog extends BaseDialogBean
}
// write changes to layer so files are marked as modified
avmSyncService.update(diffs, true, true, false, false, null, null);
avmSyncService.update(diffs, null, true, true, false, false, null, null);
// convert package to workflow package
AVMNodeDescriptor packageDesc = avmService.lookup(-1, packagesPath);