mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
- some improved error handling for editing of renditions when the form instance data has been reverted
- not caching the forms list within the web project as it is not being properly refreshed when the web project is edited - better error handling in create web content for when the workflow has not properly been configured. - more work on getting edit and preview working from manage tasks screen. it should all be in place now though i am completely unable to preview right now - need to hear back from jon. had to reduce reliance on AVMBrowseBean from actions since the current path is not necessarily properly set since it's outside of a browse context. - some error handling in rendition if the primary form instance data is not there. - adding a backward webproject noderef reference to the staging store to make it possible to get web project properties without an avmbrowsebean context git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4708 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -36,6 +36,7 @@ import org.alfresco.web.bean.repository.Repository;
|
||||
import org.alfresco.web.bean.repository.TransientNode;
|
||||
import org.alfresco.web.bean.wcm.AVMConstants;
|
||||
import org.alfresco.web.bean.wcm.AVMNode;
|
||||
import org.alfresco.web.config.ClientConfigElement;
|
||||
import org.alfresco.web.config.DialogsConfigElement.DialogButtonConfig;
|
||||
import org.alfresco.web.ui.common.Utils;
|
||||
import org.alfresco.web.ui.common.component.UIActionLink;
|
||||
@@ -544,8 +545,7 @@ public class ManageTaskDialog extends BaseDialogBean
|
||||
WCMModel.PROP_AVM_DIR_INDIRECTION);
|
||||
final String stagingAvmPath = AVMNodeConverter.ToAVMVersionPath(stagingNodeRef).getSecond();
|
||||
final String packageAvmPath = AVMNodeConverter.ToAVMVersionPath(this.workflowPackage).getSecond();
|
||||
LOGGER.debug("comparing " + packageAvmPath +
|
||||
" with " + stagingAvmPath);
|
||||
LOGGER.debug("comparing " + packageAvmPath + " with " + stagingAvmPath);
|
||||
for (AVMDifference d : this.avmSyncService.compare(-1, packageAvmPath,
|
||||
-1, stagingAvmPath,
|
||||
null))
|
||||
@@ -685,10 +685,18 @@ public class ManageTaskDialog extends BaseDialogBean
|
||||
// ------------------------------------------------------------------------------
|
||||
// Helper methods
|
||||
|
||||
protected void addAVMNode(AVMNode node)
|
||||
protected void addAVMNode(final AVMNode node)
|
||||
{
|
||||
LOGGER.debug("adding node " + node);
|
||||
node.getProperties().put("taskId", this.task.id);
|
||||
final ClientConfigElement config = Application.getClientConfig(FacesContext.getCurrentInstance());
|
||||
final String dns = AVMConstants.lookupStoreDNS(AVMConstants.getStoreName(node.getPath()));
|
||||
node.getProperties().put("previewUrl",
|
||||
AVMConstants.buildAssetUrl(AVMConstants.getSandboxRelativePath(node.getPath()),
|
||||
config.getWCMDomain(),
|
||||
config.getWCMPort(),
|
||||
dns));
|
||||
|
||||
this.browseBean.setupCommonBindingProperties(node);
|
||||
final String packagePath = AVMNodeConverter.ToAVMVersionPath(this.workflowPackage).getSecond();
|
||||
NodePropertyResolver resolverPath = new NodePropertyResolver()
|
||||
@@ -714,9 +722,6 @@ public class ManageTaskDialog extends BaseDialogBean
|
||||
// node.remove("path");
|
||||
// node.addPropertyResolver("path", resolverPath);
|
||||
// node.addPropertyResolver("displayPath", resolverPath);
|
||||
|
||||
LOGGER.debug("created mapnode " + node);
|
||||
|
||||
this.resources.add(node);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user