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 1.4 to HEAD

Browse Source 
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4392 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4399 .
   svn resolved root\projects\repository\source\java\org\alfresco\repo\jscript\Node.java


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4660 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2006-12-19 16:01:52 +00:00
parent b596814861
commit c4e8e02cf8
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
project-build.xml
View File

@@ -76,8 +76,8 @@
<!-- add config files to WEB-INF/classes --> <!-- add config files to WEB-INF/classes -->
<copy todir="${dir.assemble}/WEB-INF/classes"> <copy todir="${dir.assemble}/WEB-INF/classes">
<fileset dir="${dir.config.repository}" excludes="**/*.sample" /> <fileset dir="${dir.config.repository}" excludes="**/extension/**" />
<fileset dir="${dir.config.webclient}" excludes="**/*.sample" /> <fileset dir="${dir.config.webclient}" excludes="**/extension/**" />
</copy> </copy>
<!-- clean up previously generated properties files --> <!-- clean up previously generated properties files -->

11
source/java/org/alfresco/web/bean/DocumentDetailsBean.java
View File

@@ -37,6 +37,7 @@ import org.alfresco.service.cmr.lock.LockService;
import org.alfresco.service.cmr.repository.ContentData; import org.alfresco.service.cmr.repository.ContentData;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.TemplateNode; import org.alfresco.service.cmr.repository.TemplateNode;
import org.alfresco.service.cmr.security.PermissionService;
import org.alfresco.service.cmr.version.Version; import org.alfresco.service.cmr.version.Version;
import org.alfresco.service.cmr.version.VersionHistory; import org.alfresco.service.cmr.version.VersionHistory;
import org.alfresco.service.cmr.version.VersionService; import org.alfresco.service.cmr.version.VersionService;
@@ -638,7 +639,8 @@ public class DocumentDetailsBean extends BaseDetailsBean
} }
/** /**
* @return the working copy document Node for this document if found or null if not * @return the working copy document Node for this document if found and the
* current has permission or null if not
*/ */
public Node getWorkingCopyDocument() public Node getWorkingCopyDocument()
{ {
@@ -650,6 +652,13 @@ public class DocumentDetailsBean extends BaseDetailsBean
if (workingCopyRef != null) if (workingCopyRef != null)
{ {
workingCopyNode = new Node(workingCopyRef); workingCopyNode = new Node(workingCopyRef);
// if the current user does not have read permission on
// working copy return null
if (workingCopyNode.hasPermission(PermissionService.READ) == false)
{
workingCopyNode = null;
}
} }
} }

2
source/web/jsp/dialog/document-details.jsp
View File

@@ -75,7 +75,7 @@
<div class="mainSubText"> <div class="mainSubText">
<h:outputText value="#{msg.location}" />: <r:nodePath value="#{DocumentDetailsBean.document.nodeRef}" breadcrumb="true" actionListener="#{BrowseBean.clickSpacePath}" /> <h:outputText value="#{msg.location}" />: <r:nodePath value="#{DocumentDetailsBean.document.nodeRef}" breadcrumb="true" actionListener="#{BrowseBean.clickSpacePath}" />
</div> </div>
<a:panel id="working-copy" rendered="#{DocumentDetailsBean.locked}"> <a:panel id="working-copy" rendered="#{DocumentDetailsBean.locked && DocumentDetailsBean.workingCopyDocument != null}">
<div class="mainSubText"> <div class="mainSubText">
<h:outputText id="out-workingcopy" value="#{msg.working_copy_document}" />: <h:outputText id="out-workingcopy" value="#{msg.working_copy_document}" />:
<a:actionLink id="act-details" rendered="#{DocumentDetailsBean.workingCopyDocument != null}" value="#{DocumentDetailsBean.workingCopyDocument.properties.name}" actionListener="#{BrowseBean.setupContentAction}" action="showDocDetails"> <a:actionLink id="act-details" rendered="#{DocumentDetailsBean.workingCopyDocument != null}" value="#{DocumentDetailsBean.workingCopyDocument.properties.name}" actionListener="#{BrowseBean.setupContentAction}" action="showDocDetails">