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

. Fix for http://issues.alfresco.com/browse/WCM-299

Browse Source 
- Inline editing mode no longer used for HTML/Text in WCM spaces
   Not appropriate for WCM files which are editing using external editors - i.e. the browser based HTML editors make a  nasty mess of anything remotely complicated

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5057 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2007-02-06 17:16:22 +00:00
parent aa479b4ff5
commit b98c2309a4
4 changed files with 4 additions and 355 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
source/java/org/alfresco/web/bean/wcm/AVMEditBean.java
View File

@@ -361,38 +361,24 @@ public class AVMEditBean
String mimetype = reader.getMimetype();
String outcome = null;
// calculate which editor screen to display
if (MimetypeMap.MIMETYPE_TEXT_PLAIN.equals(mimetype) ||
MimetypeMap.MIMETYPE_XML.equals(mimetype) ||
MimetypeMap.MIMETYPE_TEXT_CSS.equals(mimetype) ||
MimetypeMap.MIMETYPE_JAVASCRIPT.equals(mimetype))
if (MimetypeMap.MIMETYPE_XML.equals(mimetype) &&
this.avmService.hasAspect(-1, avmPath, WCMAppModel.ASPECT_FORM_INSTANCE_DATA))
{
// make content available to the editing screen
this.setEditorOutput(reader.getContentString());
this.setFormProcessorSession(null);
this.instanceDataDocument = null;
this.form = null;
// navigate to appropriate screen
outcome = ((MimetypeMap.MIMETYPE_XML.equals(mimetype) &&
this.avmService.hasAspect(-1, avmPath, WCMAppModel.ASPECT_FORM_INSTANCE_DATA))
? "dialog:editAvmXmlInline"
: "dialog:editAvmTextInline");
}
else if (MimetypeMap.MIMETYPE_HTML.equals(mimetype))
{
// make content available to the editing screen
setDocumentContent(reader.getContentString());
setEditorOutput(null);
// navigate to appropriate screen
outcome = "dialog:editAvmHtmlInline";
outcome = "dialog:editAvmXmlInline";
}
else
{
// normal downloadable document
outcome = "dialog:editAvmFile";
}
final FacesContext fc = FacesContext.getCurrentInstance();
fc.getApplication().getNavigationHandler().handleNavigation(fc, null, outcome);
}