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

Change to the way we apply 'versionable' aspect by default to uploaded documents. Aspect is still applied but "autoversion" and "create initial version" features are off by default. First version is instead explicitly created during checkout process.

Browse Source 
Fix to apply 'versionable' aspect to documents that are being updated via the Share client but were initially uploaded via another route i.e. FTP or JSF Client.
Minor fix to doclist json to handle documents that have 'versionable' aspect applied but do not have any version history.
Code cleanup to ML document details.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10370 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2008-08-14 14:54:25 +00:00
parent 1824fcc35d
commit 3379d0bc9b
2 changed files with 159 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
source/java/org/alfresco/web/bean/content/DocumentDetailsDialog.java
View File

@@ -92,7 +92,6 @@ public class DocumentDetailsDialog extends BaseDetailsBean implements Navigatio
private static final String MSG_LOCATION = "location";
private final static String MSG_CLOSE = "close";
private static final String ML_VERSION_PANEL_ID = "ml-versions-panel";
transient protected LockService lockService;
@@ -104,6 +103,11 @@ public class DocumentDetailsDialog extends BaseDetailsBean implements Navigatio
private Node translationDocument;
/** List of client light weight edition histories */
private List<SingleEditionBean> editionHistory = null;
/** For the client side iteration on the edition hitories list, it represents the index of the list */
private int currentEditionCursorPosition;
// ------------------------------------------------------------------------------
@@ -114,8 +118,6 @@ public class DocumentDetailsDialog extends BaseDetailsBean implements Navigatio
*/
public DocumentDetailsDialog()
{
super();
// initial state of some panels that don't use the default
panels.put("version-history-panel", false);
panels.put("ml-info-panel", false);
@@ -145,13 +147,24 @@ public class DocumentDetailsDialog extends BaseDetailsBean implements Navigatio
return (String)getDocument().getProperties().get("url");
}
/**
* @return the translation document for this node
*/
public Node getTranslationDocument()
{
return translationDocument;
}
/**
* Before opening the ml container details, remeber the translation
* from which the action comes.
*
* @param node
*/
public void setTranslationDocument(Node node)
{
this.translationDocument = node;
}
/**
* Returns the URL to the content for the current document
@@ -287,16 +300,6 @@ public class DocumentDetailsDialog extends BaseDetailsBean implements Navigatio
return versions;
}
/** List of client light weight edition histories */
private List<SingleEditionBean> editionHistory = null;
/** For the client side iteration on the edition hitories list, it represents the index of the list */
private int currentEditionCursorPosition;
/**
* For the client side iteration on the edition hitories list,
* return the next edition history.
@@ -321,7 +324,6 @@ public class DocumentDetailsDialog extends BaseDetailsBean implements Navigatio
return editionHistory.get(currentEditionCursorPosition);
}
/**
* Constructs a list of objects representing the editions of the
* logical document
@@ -817,19 +819,6 @@ public class DocumentDetailsDialog extends BaseDetailsBean implements Navigatio
return this.getNode();
}
/**
* Before opening the ml container details, remeber the translation
* from which the action comes.
*
* @param node
*/
public void setTranslationDocument(Node node)
{
this.translationDocument = node;
}
/**
* Returns the ml container of the document this bean is currently representing
*
@@ -984,7 +973,6 @@ public class DocumentDetailsDialog extends BaseDetailsBean implements Navigatio
return null;
}
public String getOutcome()
{
return "dialog:close:dialog:showDocDetails";

2
source/java/org/alfresco/web/bean/ml/SingleEditionBean.java
View File

@@ -69,5 +69,3 @@ public class SingleEditionBean implements Serializable
this.translations.add(translation);
}
}