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 
78438: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      77695: ACE-2149 - EOL AVM / WCM. Ripped WCM out of Explorer.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82564 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Erik Winlof
2014-09-03 12:18:05 +00:00
parent 1ea3931e33
commit 124f05593e
221 changed files with 21 additions and 28579 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -317,24 +317,7 @@ public class CheckinCheckoutDialog extends BaseDialogBean
{
boolean editingInline = false;
Node node = setupContentDocument(id);
// // 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)