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

Fixed compilation issue following merge

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6902 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gavin Cornwell
2007-10-02 20:18:36 +00:00
parent d90fd683b3
commit d2bf9cae06
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/java/org/alfresco/web/bean/TrashcanItemDetailsDialog.java
View File

@@ -27,6 +27,7 @@ package org.alfresco.web.bean;
import javax.faces.context.FacesContext; import javax.faces.context.FacesContext;
import org.alfresco.service.cmr.repository.Path; import org.alfresco.service.cmr.repository.Path;
import org.alfresco.service.cmr.security.PermissionService;
import org.alfresco.web.app.Application; import org.alfresco.web.app.Application;
import org.alfresco.web.bean.repository.Node; import org.alfresco.web.bean.repository.Node;
@@ -37,6 +38,8 @@ public class TrashcanItemDetailsDialog extends TrashcanDialog
private static final String MSG_ORIGINAL_LOCATION = "original_location"; private static final String MSG_ORIGINAL_LOCATION = "original_location";
private static final String MSG_CLOSE = "close"; private static final String MSG_CLOSE = "close";
protected PermissionService permissionService;
@Override @Override
protected String finishImpl(FacesContext context, String outcome) throws Exception protected String finishImpl(FacesContext context, String outcome) throws Exception
{ {
@@ -56,7 +59,7 @@ public class TrashcanItemDetailsDialog extends TrashcanDialog
Path path = (Path) property.getItem().getProperties().get("locationPath"); Path path = (Path) property.getItem().getProperties().get("locationPath");
return Application.getMessage(FacesContext.getCurrentInstance(), MSG_ORIGINAL_LOCATION) + ": " + return Application.getMessage(FacesContext.getCurrentInstance(), MSG_ORIGINAL_LOCATION) + ": " +
path.toDisplayPath(nodeService); path.toDisplayPath(nodeService, permissionService);
} }
@Override @Override
@@ -69,4 +72,9 @@ public class TrashcanItemDetailsDialog extends TrashcanDialog
{ {
return property.getItem(); return property.getItem();
} }
public void setPermissionService(PermissionService permissionService)
{
this.permissionService = permissionService;
}
} }

4
source/web/WEB-INF/faces-config-beans.xml
View File

@@ -4709,6 +4709,10 @@
<property-name>dictionaryService</property-name> <property-name>dictionaryService</property-name>
<value>#{DictionaryService}</value> <value>#{DictionaryService}</value>
</managed-property> </managed-property>
<managed-property>
<property-name>permissionService</property-name>
<value>#{PermissionService}</value>
</managed-property>
<managed-property> <managed-property>
<property-name>property</property-name> <property-name>property</property-name>
<value>#{TrashcanDialogProperty}</value> <value>#{TrashcanDialogProperty}</value>