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

. Missing title/description in Forms selected in Web Project wizard now correctly taken from Form def

Browse Source 
. Workflow package staging/sandbox changes copied from SubmitDialog to CreateWebContentWizard
. Fix to Form and Web Project summary screens to show workflow 'title' instead of 'name' (as 'name' is not a useful label)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4548 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2006-12-07 11:13:10 +00:00
parent e670b3dd33
commit 657c7a2b3f
6 changed files with 36 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/java/org/alfresco/web/bean/wcm/CreateWebContentWizard.java
View File

@@ -282,11 +282,12 @@ public class CreateWebContentWizard extends BaseContentWizard
LOGGER.debug("creating workflow package");
// create package paths (layered to user sandbox area as target)
String webapp = (String)website.getProperties().get(WCMAppModel.PROP_DEFAULTWEBAPP);
String sandboxPath = AVMConstants.buildAVMStoreRootPath(this.avmBrowseBean.getSandbox());
String packagesPath = AVMWorkflowUtil.createAVMLayeredPackage(this.avmService, sandboxPath);
String stagingPath = AVMConstants.buildAVMStoreRootPath(this.avmBrowseBean.getStagingStore());
String packagesPath = AVMWorkflowUtil.createAVMLayeredPackage(this.avmService, stagingPath);
// construct diffs for selected items for submission
String webapp = (String)website.getProperties().get(WCMAppModel.PROP_DEFAULTWEBAPP);
String sandboxPath = AVMConstants.buildAVMStoreRootPath(this.avmBrowseBean.getSandbox());
List<AVMDifference> diffs = new ArrayList<AVMDifference>(8);
for (Rendition rendition : this.getRenditions())
{
@@ -315,6 +316,10 @@ public class CreateWebContentWizard extends BaseContentWizard
AVMNodeConverter.ToNodeRef(-1, packageDesc.getPath()));
this.nodeService.setProperty(packageNodeRef, WorkflowModel.PROP_IS_SYSTEM_PACKAGE, true);
parameters.put(WorkflowModel.ASSOC_PACKAGE, packageNodeRef);
// TODO: capture label and comment?
parameters.put(AVMWorkflowUtil.PROP_LABEL, this.fileName);
parameters.put(AVMWorkflowUtil.PROP_FROM_PATH, AVMConstants.buildAVMStoreRootPath(
this.avmBrowseBean.getSandbox()));
if (LOGGER.isDebugEnabled())
LOGGER.debug("starting workflow " + wd + " with parameters " + parameters);

7
source/java/org/alfresco/web/bean/wcm/CreateWebsiteWizard.java
View File

@@ -500,7 +500,7 @@ public class CreateWebsiteWizard extends BaseWizardBean
{
UIListItem item = new UIListItem();
item.setValue(form);
item.setLabel(form.getName());
item.setLabel(form.getTitle());
item.setDescription(form.getDescription());
item.setImage(WebResources.IMAGE_WEBFORM_32);
items.add(item);
@@ -519,7 +519,10 @@ public class CreateWebsiteWizard extends BaseWizardBean
if (index != -1)
{
Form form = (Form)this.formsList.get(index).getValue();
this.forms.add(this.new FormWrapper(form));
FormWrapper wrapper = new FormWrapper(form);
wrapper.setTitle(form.getTitle());
wrapper.setDescription(form.getDescription());
this.forms.add(wrapper);
}
}