From e5babd2675dc2a88cbf25ad028be6a6a8d9f5d30 Mon Sep 17 00:00:00 2001 From: Kevin Roast Date: Tue, 21 Nov 2006 17:13:04 +0000 Subject: [PATCH] . Staging area 'snapshot' action implemented in the UI . List of Recent Snapshots component added to Staging area information table - TODO: finish implementing Revert to Snapshot action in the UI . Date filter UI implemented for recent snapshots (as there will be lots!) . Fixed issue with name/title confusion in FormsService.getForm(name) method . Added Default Webapp field to Create Web Project wizard and added to WCM model for a web project - TODO: implement this as default root path when browsing a sandbox git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4413 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- config/alfresco/model/applicationModel.xml | 3 +++ source/java/org/alfresco/model/ContentModel.java | 1 + .../org/alfresco/repo/avm/actions/SimpleAVMSubmitAction.java | 3 ++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/config/alfresco/model/applicationModel.xml b/config/alfresco/model/applicationModel.xml index 23ff8df578..5f2a4afbf5 100644 --- a/config/alfresco/model/applicationModel.xml +++ b/config/alfresco/model/applicationModel.xml @@ -60,6 +60,9 @@ d:text + + d:text + diff --git a/source/java/org/alfresco/model/ContentModel.java b/source/java/org/alfresco/model/ContentModel.java index 271b8249dd..0b15dab12c 100644 --- a/source/java/org/alfresco/model/ContentModel.java +++ b/source/java/org/alfresco/model/ContentModel.java @@ -235,6 +235,7 @@ public interface ContentModel // AVM web folder static final QName TYPE_AVMWEBFOLDER = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "webfolder"); static final QName PROP_AVMSTORE = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "avmstore"); + static final QName PROP_DEFAULTWEBAPP = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "defaultwebapp"); static final QName ASSOC_WEBUSER = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "webuser"); static final QName ASSOC_WEBFORM = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "webform"); static final QName ASSOC_WEBWORKFLOWDEFAULTS = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "webworkflowdefaults"); diff --git a/source/java/org/alfresco/repo/avm/actions/SimpleAVMSubmitAction.java b/source/java/org/alfresco/repo/avm/actions/SimpleAVMSubmitAction.java index 127895f137..0cabf9bc15 100644 --- a/source/java/org/alfresco/repo/avm/actions/SimpleAVMSubmitAction.java +++ b/source/java/org/alfresco/repo/avm/actions/SimpleAVMSubmitAction.java @@ -117,7 +117,8 @@ public class SimpleAVMSubmitAction extends ActionExecuterAbstractBase fAVMSyncService.compare(version, path, -1, avmDest); // TODO fix update comments at some point. // Do the update. - fAVMSyncService.update(diffs, false, false, true, true, null, null); + fAVMSyncService.update(diffs, false, false, true, true, + "Submit of item: " + AVMNodeConverter.SplitBase(path)[1], null); // Cleanup by flattening the source relative to the destination. AVMDAOs.Instance().fAVMNodeDAO.flush(); fAVMSyncService.flatten(storePath[0] + ":/appBase", websiteName + "-staging:/appBase");