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

. Staging area 'snapshot' action implemented in the UI

Browse Source 
. 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
This commit is contained in:
Kevin Roast
2006-11-21 17:13:04 +00:00
parent 75f3c91b12
commit e5babd2675
3 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/alfresco/model/applicationModel.xml
View File

@@ -60,6 +60,9 @@
<property name="app:avmstore"> <property name="app:avmstore">
<type>d:text</type> <type>d:text</type>
</property> </property>
<property name="app:defaultwebapp">
<type>d:text</type>
</property>
</properties> </properties>
<associations> <associations>
<child-association name="app:webuser"> <child-association name="app:webuser">

1
source/java/org/alfresco/model/ContentModel.java
View File

@@ -235,6 +235,7 @@ public interface ContentModel
// AVM web folder // AVM web folder
static final QName TYPE_AVMWEBFOLDER = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "webfolder"); 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_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_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_WEBFORM = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "webform");
static final QName ASSOC_WEBWORKFLOWDEFAULTS = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "webworkflowdefaults"); static final QName ASSOC_WEBWORKFLOWDEFAULTS = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "webworkflowdefaults");

3
source/java/org/alfresco/repo/avm/actions/SimpleAVMSubmitAction.java
View File

@@ -117,7 +117,8 @@ public class SimpleAVMSubmitAction extends ActionExecuterAbstractBase
fAVMSyncService.compare(version, path, -1, avmDest); fAVMSyncService.compare(version, path, -1, avmDest);
// TODO fix update comments at some point. // TODO fix update comments at some point.
// Do the update. // 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. // Cleanup by flattening the source relative to the destination.
AVMDAOs.Instance().fAVMNodeDAO.flush(); AVMDAOs.Instance().fAVMNodeDAO.flush();
fAVMSyncService.flatten(storePath[0] + ":/appBase", websiteName + "-staging:/appBase"); fAVMSyncService.flatten(storePath[0] + ":/appBase", websiteName + "-staging:/appBase");