. CreateWebContentWizard can now be used to create inline TXT and HTML files again...

. Fix to display of deleted file/folder icons in Submit Dialog

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4575 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2006-12-11 23:01:45 +00:00
parent 87e57b8fac
commit 66ca97a16a
2 changed files with 41 additions and 27 deletions

View File

@@ -444,12 +444,11 @@ public class SubmitDialog extends BaseDialogBean
{
// found a generated rendition asset - locate the parent form instance data file
// and use this to find all generated assets that are appropriate
// NOTE: this ref will be in the 'preview' store convert back to user store first
// NOTE: this path value is store relative
String strFormInstance = (String)this.nodeService.getProperty(
ref, WCMAppModel.PROP_PRIMARY_FORM_INSTANCE_DATA);
strFormInstance = strFormInstance.replaceFirst(AVMConstants.STORE_PREVIEW,
AVMConstants.STORE_MAIN);
formInstanceDataRef = new NodeRef(strFormInstance);
ref, WCMAppModel.PROP_PRIMARY_FORM_INSTANCE_DATA);
strFormInstance = this.avmBrowseBean.getSandbox() + ':' + strFormInstance;
formInstanceDataRef = AVMNodeConverter.ToNodeRef(-1, strFormInstance);
}
// add the form instance data file to the list for submission
@@ -674,7 +673,7 @@ public class SubmitDialog extends BaseDialogBean
public String getIcon()
{
if (descriptor.isDeletedFile())
if (descriptor.isFile() || descriptor.isDeletedFile())
{
return Utils.getFileTypeImage(descriptor.getName(), true);
}