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.2 to HEAD

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

13
source/java/org/alfresco/web/bean/wcm/AVMBrowseBean.java
View File

@@ -47,6 +47,7 @@ import org.alfresco.config.ConfigService;
import org.alfresco.linkvalidation.HrefValidationProgress;
import org.alfresco.model.WCMAppModel;
import org.alfresco.repo.avm.AVMNodeConverter;
import org.alfresco.repo.avm.AVMNodeType;
import org.alfresco.repo.avm.actions.AVMRevertStoreAction;
import org.alfresco.repo.avm.actions.AVMUndoSandboxListAction;
import org.alfresco.repo.domain.PropertyValue;
@@ -1123,6 +1124,18 @@ public class AVMBrowseBean implements IContextListener
if (avmRef.isDirectory())
{
node.getProperties().put("smallIcon", BrowseBean.SPACE_SMALL_DEFAULT);
String type = "";
if (avmRef.getType() == AVMNodeType.LAYERED_DIRECTORY && avmRef.isPrimary())
{
type = Application.getMessage(FacesContext.getCurrentInstance(), "shared_folder");
}
else
{
type = Application.getMessage(FacesContext.getCurrentInstance(), "folder");
}
node.getProperties().put("folderType", type);
this.folders.add(node);
}
else