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 V2.1 to HEAD

Browse Source 
6293: WCM fixes by Ariel (no details)
   6294: Fogotten file for above


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6717 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2007-09-10 12:26:25 +00:00
parent 03afc572b3
commit 10236f165a
47 changed files with 1596 additions and 718 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
source/java/org/alfresco/web/action/evaluator/WCMLockEvaluator.java
View File

@@ -34,6 +34,7 @@ import org.alfresco.web.app.servlet.FacesHelper;
import org.alfresco.web.bean.repository.Node;
import org.alfresco.web.bean.repository.Repository;
import org.alfresco.web.bean.wcm.AVMBrowseBean;
import org.alfresco.web.bean.wcm.WebProject;
/**
* Evaluator to return if a item is accessable due to a WCM user level lock.
@@ -45,15 +46,22 @@ public class WCMLockEvaluator implements ActionEvaluator
/**
* @return true if the item is not locked by another user
*/
public boolean evaluate(Node node)
public boolean evaluate(final Node node)
{
FacesContext fc = FacesContext.getCurrentInstance();
AVMLockingService avmLockService = Repository.getServiceRegistry(fc).getAVMLockingService();
AVMBrowseBean avmBrowseBean = (AVMBrowseBean)FacesHelper.getManagedBean(fc, AVMBrowseBean.BEAN_NAME);
final FacesContext fc = FacesContext.getCurrentInstance();
final AVMLockingService avmLockService = Repository.getServiceRegistry(fc).getAVMLockingService();
final AVMBrowseBean avmBrowseBean = (AVMBrowseBean)FacesHelper.getManagedBean(fc, AVMBrowseBean.BEAN_NAME);
String path = AVMNodeConverter.ToAVMVersionPath(node.getNodeRef()).getSecond();
String username = Application.getCurrentUser(fc).getUserName();
final String path = AVMNodeConverter.ToAVMVersionPath(node.getNodeRef()).getSecond();
final String username = Application.getCurrentUser(fc).getUserName();
return avmLockService.hasAccess(avmBrowseBean.getWebProject().getNodeRef(), path, username);
WebProject webProject = avmBrowseBean.getWebProject();
if (webProject == null)
{
// when in a workflow context, the WebProject may not be accurate on the browsebean
// so get the web project associated with the path
webProject = new WebProject(path);
}
return avmLockService.hasAccess(webProject.getNodeRef(), path, username);
}
}