Merged V2.2 to HEAD

7687: Added ability to create/delete layered folders in the staging area, thus allowing folders from other web projects to be shared
            Added title field to create folder dialog
  7688: Added separate dialog for deleting layered folders
  7692: WCM-993: Added ability to edit the defualt webapp for a web project

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8460 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gavin Cornwell
2008-03-07 11:54:47 +00:00
parent a1cfeac9f5
commit cb23859b03
20 changed files with 926 additions and 16 deletions

View File

@@ -28,6 +28,8 @@ import java.util.List;
import javax.faces.context.FacesContext;
import org.alfresco.repo.avm.AVMNodeType;
import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
import org.alfresco.web.app.Application;
import org.alfresco.web.bean.repository.Node;
@@ -66,6 +68,23 @@ public class FolderDetailsBean extends AVMDetailsBean
{
return AVMUtil.buildAssetUrl(getAvmNode().getPath());
}
/**
* @return true if the folder is a layered folder with a primary indirection
*/
public boolean getIsPrimaryLayeredFolder()
{
boolean result = false;
String path = getAvmNode().getPath();
AVMNodeDescriptor nodeDesc = getAvmService().lookup(-1, path);
if (nodeDesc != null)
{
result = (nodeDesc.getType() == AVMNodeType.LAYERED_DIRECTORY && nodeDesc.isPrimary());
}
return result;
}
/**
* @see org.alfresco.web.bean.wcm.AVMDetailsBean#getNodes()