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

- make edit of renditions bring up form editor rather than the editor for the file type.

Browse Source 
- disable finish button on first screen of create web content wizard.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4239 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ariel Backenroth
2006-10-26 22:25:24 +00:00
parent e7c186b5dc
commit fcb625735f
4 changed files with 33 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,12 +33,12 @@ import org.alfresco.service.cmr.repository.ContentService;
import org.alfresco.service.cmr.repository.ContentWriter;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.util.Pair;
import org.alfresco.web.app.AlfrescoNavigationHandler;
import org.alfresco.web.app.Application;
import org.alfresco.web.app.servlet.DownloadContentServlet;
import org.alfresco.web.bean.CheckinCheckoutBean;
import org.alfresco.web.bean.FileUploadBean;
import org.alfresco.web.bean.repository.Node;
import org.alfresco.web.bean.repository.Repository;
import org.alfresco.web.forms.Form;
import org.alfresco.web.forms.FormProcessor;
@@ -55,7 +55,7 @@ import org.w3c.dom.Document;
*/
public class AVMEditBean
{
private static Log logger = LogFactory.getLog(AVMEditBean.class);
private static final Log LOGGER = LogFactory.getLog(AVMEditBean.class);
private static final String MSG_ERROR_UPDATE = "error_update";
private static final String MSG_UPLOAD_SUCCESS = "file_upload_success";
@@ -143,7 +143,8 @@ public class AVMEditBean
*/
public String getUrl()
{
return DownloadContentServlet.generateDownloadURL(AVMNodeConverter.ToNodeRef(-1, getAvmNode().getPath()), getAvmNode().getName());
return DownloadContentServlet.generateDownloadURL(AVMNodeConverter.ToNodeRef(-1, getAvmNode().getPath()),
getAvmNode().getName());
}
/**
@@ -264,13 +265,25 @@ public class AVMEditBean
// retrieve the content reader for this node
NodeRef avmRef = AVMNodeConverter.ToNodeRef(-1, getAvmNode().getPath());
if (logger.isDebugEnabled())
logger.debug("Editing AVM node: " + avmRef.toString());
if (this.nodeService.hasAspect(avmRef, WCMModel.ASPECT_RENDITION))
{
if (LOGGER.isDebugEnabled())
LOGGER.debug(avmRef + " is a rendition, editing primary rendition instead");
avmRef = (NodeRef)this.nodeService.getProperty(avmRef, WCMModel.PROP_PRIMARY_FORM_INSTANCE_DATA);
final Pair<Integer, String> p = AVMNodeConverter.ToAVMVersionPath(avmRef);
if (LOGGER.isDebugEnabled())
LOGGER.debug("Editing primary form instance data " + p.getSecond() + " version " + p.getFirst());
final AVMNode avmNode = new AVMNode(this.avmService.lookup(p.getFirst(), p.getSecond()));
this.avmBrowseBean.setAvmActionNode(avmNode);
}
if (LOGGER.isDebugEnabled())
LOGGER.debug("Editing AVM node: " + avmRef.toString());
ContentReader reader = contentService.getReader(avmRef, ContentModel.PROP_CONTENT);
if (reader != null)
{
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) ||
@@ -281,17 +294,10 @@ public class AVMEditBean
setEditorOutput(reader.getContentString());
// navigate to appropriate screen
FacesContext fc = FacesContext.getCurrentInstance();
String outcome;
if (MimetypeMap.MIMETYPE_XML.equals(mimetype))
{
outcome = "dialog:editAvmXmlInline";
}
else
{
outcome = "dialog:editAvmTextInline";
}
fc.getApplication().getNavigationHandler().handleNavigation(fc, null, outcome);
outcome = ((MimetypeMap.MIMETYPE_XML.equals(mimetype) &&
this.nodeService.hasAspect(avmRef, WCMModel.ASPECT_FORM_INSTANCE_DATA))
? "dialog:editAvmXmlInline"
: "dialog:editAvmTextInline");
}
else if (MimetypeMap.MIMETYPE_HTML.equals(mimetype))
{
@@ -300,15 +306,16 @@ public class AVMEditBean
setEditorOutput(null);
// navigate to appropriate screen
FacesContext fc = FacesContext.getCurrentInstance();
fc.getApplication().getNavigationHandler().handleNavigation(fc, null, "dialog:editAvmHtmlInline");
outcome = "dialog:editAvmHtmlInline";
}
else
{
// normal downloadable document
FacesContext fc = FacesContext.getCurrentInstance();
fc.getApplication().getNavigationHandler().handleNavigation(fc, null, "dialog:editAvmFile");
outcome = "dialog:editAvmFile";
}
final FacesContext fc = FacesContext.getCurrentInstance();
fc.getApplication().getNavigationHandler().handleNavigation(fc, null, outcome);
}
}
@@ -355,8 +362,8 @@ public class AVMEditBean
// commit the transaction
tx.commit();
// TODO: regenerate form content
if (nodeService.getProperty(avmRef, WCMModel.PROP_PARENT_FORM) != null)
// regenerate form content
if (nodeService.hasAspect(avmRef, WCMModel.ASPECT_FORM_INSTANCE_DATA))
{
final FormsService fs = FormsService.getInstance();
fs.regenerateRenditions(avmRef);

3
source/java/org/alfresco/web/forms/FormsService.java
View File

@@ -297,8 +297,7 @@ public final class FormsService
props = new HashMap<QName, Serializable>(2, 1.0f);
props.put(WCMModel.PROP_PARENT_RENDERING_ENGINE, re.getNodeRef());
props.put(WCMModel.PROP_PRIMARY_FORM_INSTANCE_DATA,
AVMNodeConverter.ToNodeRef(-1, parentPath + formInstanceDataFileName));
props.put(WCMModel.PROP_PRIMARY_FORM_INSTANCE_DATA, formInstanceDataNodeRef);
nodeService.addAspect(renditionNodeRef, WCMModel.ASPECT_RENDITION, props);
props = new HashMap<QName, Serializable>(1, 1.0f);