various minor bug fixes to create/edit form, parseXMLDocuments

- WCM-351 fixes to select workflow screen on IE (weird onchange behavior)
- WCM-468 fixes to remove rendering engine
- doing the jsp 2.0 thing
- WCM-427 fix to encoding issue with parseXMLDocuements
- fix for remove rendering engine templates in create form (wasn't clearing the list in init)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5630 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ariel Backenroth
2007-05-04 21:02:05 +00:00
parent 3c1db37e0c
commit 6e0afbf34c
9 changed files with 357 additions and 318 deletions

View File

@@ -583,11 +583,13 @@ public class CreateFormWizard
*/
public String removeUploadedSchemaFile()
{
LOGGER.debug("removing uploaded rendering engine template file " +
this.getRenderingEngineTemplateFileName());
this.clearUpload(FILE_SCHEMA);
this.schemaRootElementNameChoices = null;
this.schema = null;
this.schemaFileName = null;
assert this.getSchemaFileName() == null;
// refresh the current page
return null;
}
@@ -597,8 +599,11 @@ public class CreateFormWizard
*/
public String removeUploadedRenderingEngineTemplateFile()
{
clearUpload(FILE_RENDERING_ENGINE_TEMPLATE);
LOGGER.debug("removing uploaded rendering engine template file " +
this.getRenderingEngineTemplateFileName());
this.clearUpload(FILE_RENDERING_ENGINE_TEMPLATE);
this.renderingEngineTemplateFileName = null;
assert this.getRenderingEngineTemplateFileName() == null;
// refresh the current page
return null;
}

View File

@@ -137,6 +137,7 @@ public class EditFormWizard
this.new RenderingEngineTemplateData(ret);
this.renderingEngineTemplates.add(data);
}
this.removedRenderingEngineTemplates = null;
}
/**
@@ -192,7 +193,7 @@ public class EditFormWizard
if (this.getSchemaFile() != null)
{
FileInfo fileInfo =
final FileInfo fileInfo =
this.fileFolderService.create(formNodeRef,
this.getSchemaFileName(),
ContentModel.TYPE_CONTENT);
@@ -211,13 +212,16 @@ public class EditFormWizard
if (this.removedRenderingEngineTemplates != null)
{
for (RenderingEngineTemplateData retd : this.removedRenderingEngineTemplates)
for (final RenderingEngineTemplateData retd : this.removedRenderingEngineTemplates)
{
LOGGER.debug("removing rendering engine template " + retd);
assert retd != null;
assert retd.getNodeRef() != null;
this.nodeService.removeChild(formNodeRef, retd.getNodeRef());
}
}
for (RenderingEngineTemplateData retd : this.renderingEngineTemplates)
for (final RenderingEngineTemplateData retd : this.renderingEngineTemplates)
{
if (retd.getFile() != null)
{