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

Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

Browse Source 
78414: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      75784: ACE-2149: EOL AVM / WCM
       - Get 'web-client' project to compile
       - For further work, all bits that required commenting or changing were tagged with '// WCM'
         i.e. a search for 'WCM' will highlight all the code changes made
       - TODO: Visit jsp files and other config to do a proper job


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82546 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Erik Winlof
2014-09-03 12:08:20 +00:00
parent 5cf4251421
commit 34d911b025
35 changed files with 1176 additions and 3862 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
source/java/org/alfresco/web/bean/coci/CheckinCheckoutDialog.java
View File

@@ -29,7 +29,6 @@ import javax.faces.event.ActionEvent;
import org.alfresco.model.ApplicationModel;
import org.alfresco.model.ContentModel;
import org.alfresco.model.WCMAppModel;
import org.alfresco.repo.content.MimetypeMap;
import org.alfresco.repo.transaction.RetryingTransactionHelper;
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
@@ -319,22 +318,26 @@ public class CheckinCheckoutDialog extends BaseDialogBean
boolean editingInline = false;
Node node = setupContentDocument(id);
if (node.hasAspect(WCMAppModel.ASPECT_FORM_INSTANCE_DATA))
{
editingInline = true;
// editable form document
FacesContext fc = FacesContext.getCurrentInstance();
this.navigator.setupDispatchContext(node);
// TODO - rename editContent Wizard since it only deals with editing form content
fc.getApplication().getNavigationHandler().handleNavigation(fc, null, "wizard:editContent");
}
// detect the inline editing aspect to see which edit mode to use
else if (node.hasAspect(ApplicationModel.ASPECT_INLINEEDITABLE) &&
node.getProperties().get(ApplicationModel.PROP_EDITINLINE) != null &&
((Boolean)node.getProperties().get(ApplicationModel.PROP_EDITINLINE)).booleanValue() == true)
// // WCM
// if (node.hasAspect(WCMAppModel.ASPECT_FORM_INSTANCE_DATA))
// {
// editingInline = true;
//
// // editable form document
// FacesContext fc = FacesContext.getCurrentInstance();
// this.navigator.setupDispatchContext(node);
//
// // TODO - rename editContent Wizard since it only deals with editing form content
// fc.getApplication().getNavigationHandler().handleNavigation(fc, null, "wizard:editContent");
// }
//
// // detect the inline editing aspect to see which edit mode to use
// else if (node.hasAspect(ApplicationModel.ASPECT_INLINEEDITABLE) &&
// node.getProperties().get(ApplicationModel.PROP_EDITINLINE) != null &&
// ((Boolean)node.getProperties().get(ApplicationModel.PROP_EDITINLINE)).booleanValue() == true)
if (node.hasAspect(ApplicationModel.ASPECT_INLINEEDITABLE) &&
node.getProperties().get(ApplicationModel.PROP_EDITINLINE) != null &&
((Boolean)node.getProperties().get(ApplicationModel.PROP_EDITINLINE)).booleanValue() == true)
{
// retrieve the content reader for this node
ContentReader reader = property.getContentService().getReader(node.getNodeRef(), ContentModel.PROP_CONTENT);