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

Merge of all UI clustering changes originally applied to 2.2

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8292 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gavin Cornwell
2008-02-15 14:59:11 +00:00
parent d20d8a7007
commit a450598ecb
281 changed files with 17771 additions and 15322 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
source/java/org/alfresco/web/bean/wcm/FileDetailsBean.java
View File

@@ -57,8 +57,10 @@ import org.alfresco.web.ui.common.component.data.UIRichList;
*/
public class FileDetailsBean extends AVMDetailsBean
{
private static final long serialVersionUID = -3263315503769148385L;
/** Action service bean reference */
private ActionService actionService;
transient private ActionService actionService;
// ------------------------------------------------------------------------------
@@ -87,6 +89,15 @@ public class FileDetailsBean extends AVMDetailsBean
this.actionService = actionService;
}
private ActionService getActionService()
{
if (actionService == null)
{
actionService = Repository.getServiceRegistry(FacesContext.getCurrentInstance()).getActionService();
}
return actionService;
}
/**
* @see org.alfresco.web.bean.wcm.AVMDetailsBean#getAvmNode()
*/
@@ -157,7 +168,7 @@ public class FileDetailsBean extends AVMDetailsBean
public List<Map<String, Object>> getVersionHistory()
{
AVMNode avmNode = getAvmNode();
List<AVMNodeDescriptor> history = this.avmService.getHistory(avmNode.getDescriptor(), -1);
List<AVMNodeDescriptor> history = this.getAvmService().getHistory(avmNode.getDescriptor(), -1);
List<Map<String, Object>> wrappers = new ArrayList<Map<String, Object>>(history.size());
for (AVMNodeDescriptor record : history)
{
@@ -166,7 +177,7 @@ public class FileDetailsBean extends AVMDetailsBean
wrapper.put("version", record.getVersionID());
wrapper.put("strVersion", Integer.toString(record.getVersionID()));
wrapper.put("modifiedDate", new Date(record.getModDate()));
Pair<Integer, String> path = this.avmService.getAPath(record);
Pair<Integer, String> path = this.getAvmService().getAPath(record);
if (path != null)
{
wrapper.put("url", DownloadContentServlet.generateBrowserURL(
@@ -196,7 +207,7 @@ public class FileDetailsBean extends AVMDetailsBean
tx.begin();
Map<String, Serializable> args = new HashMap<String, Serializable>(1, 1.0f);
List<AVMNodeDescriptor> history = this.avmService.getHistory(getAvmNode().getDescriptor(), -1);
List<AVMNodeDescriptor> history = this.getAvmService().getHistory(getAvmNode().getDescriptor(), -1);
// the history list should contain the version ID we are looking for
for (AVMNodeDescriptor record : history)
{
@@ -204,16 +215,16 @@ public class FileDetailsBean extends AVMDetailsBean
{
// the action expects the HEAD revision as the noderef and
// the to-revert param as the previous version to revert to
Action action = this.actionService.createAction(AVMRevertToVersionAction.NAME, args);
Action action = this.getActionService().createAction(AVMRevertToVersionAction.NAME, args);
args.put(AVMRevertToVersionAction.TOREVERT, record);
this.actionService.executeAction(action, getAvmNode().getNodeRef());
this.getActionService().executeAction(action, getAvmNode().getNodeRef());
// clear the version history list after a revert ready for refresh
UIRichList versionList = (UIRichList)link.findComponent("version-history-list");
versionList.setValue(null);
// reset the action node reference as the version ID has changed
avmBrowseBean.setAvmActionNode(new AVMNode(avmService.lookup(-1, getAvmNode().getPath())));
avmBrowseBean.setAvmActionNode(new AVMNode(getAvmService().lookup(-1, getAvmNode().getPath())));
break;
}
}