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

1
config/alfresco/messages/webclient.properties
View File

@@ -828,6 +828,7 @@ website_web_content_forms=Web Content Forms
website_save_location=Save Location
website_save_location_info=Use the following pattern when saving content
website_filename_pattern=Filename pattern
website_filename_match=Filename pattern match
website_workflow=Workflow
website_workflow_info=Use the following workflow
website_form_summary=Using workflow ''{0}'', with filename pattern ''{1}'', {2} rendering engine(s) selected.

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);
}
}

2
source/web/jsp/wcm/create-form-wizard/summary.jsp
View File

@@ -91,7 +91,7 @@
</c:choose>
<c:if test="${WizardManager.bean.defaultWorkflowDefinition != null}">
<h:outputText value="#{msg.name}:"/>
<h:outputText value="#{WizardManager.bean.defaultWorkflowDefinition.name}"/>
<h:outputText value="#{WizardManager.bean.defaultWorkflowDefinition.title}"/>
<h:outputText value="#{msg.description}:"/>
<h:outputText value="#{WizardManager.bean.defaultWorkflowDefinition.description}"/>
</c:if>

2
source/web/jsp/wcm/create-website-wizard/settings.jsp
View File

@@ -52,7 +52,7 @@
<f:facet name="header">
<h:outputText value="#{msg.configure}" />
</f:facet>
<h:outputText value="#{msg.website_filename_pattern}:" style="padding-right:4px" />
<h:outputText value="#{msg.website_filename_match}:" style="padding-right:4px" />
<h:inputText value="#{row.filenamePattern}" />
<h:commandButton id="cmd-1" rendered="#{WizardManager.bean.editMode == false}" value="#{msg.form_template_conf_workflow}" style="margin-left:4px" styleClass="dialogControls" action="dialog:formTemplateWorkflow" actionListener="#{WizardManager.bean.setupWorkflowAction}" />
<h:commandButton id="cmd-2" rendered="#{WizardManager.bean.editMode == true}" value="#{msg.form_template_conf_workflow}" style="margin-left:4px" styleClass="dialogControls" action="dialog:editFormTemplateWorkflow" actionListener="#{WizardManager.bean.setupWorkflowAction}" />

2
source/web/jsp/wcm/create-website-wizard/summary.jsp
View File

@@ -58,7 +58,7 @@
<f:verbatim>${r.filenamePattern}</f:verbatim>
<h:outputText value="#{msg.workflow}:" styleClass="mainSubTitle" />
<c:if test="${r.workflow != null}">
<f:verbatim>${r.workflow.name}</f:verbatim>
<f:verbatim>${r.workflow.title}</f:verbatim>
</c:if>
<c:if test="${r.workflow == null}">
<f:verbatim>${msg.none}</f:verbatim>