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

@@ -56,6 +56,7 @@ public class CreateFolderDialog extends BaseDialogBean
protected AVMBrowseBean avmBrowseBean;
protected String name;
protected String title;
protected String description;
@@ -110,6 +111,22 @@ public class CreateFolderDialog extends BaseDialogBean
{
this.description = description;
}
/**
* @return Returns the title.
*/
public String getTitle()
{
return this.title;
}
/**
* @param title The title to set.
*/
public void setTitle(String title)
{
this.title = title;
}
/**
* @return Returns the name.
@@ -143,10 +160,15 @@ public class CreateFolderDialog extends BaseDialogBean
String path = parent + '/' + this.name;
NodeRef nodeRef = AVMNodeConverter.ToNodeRef(-1, path);
this.getNodeService().addAspect(nodeRef, ApplicationModel.ASPECT_UIFACETS, null);
if (this.title != null && this.title.length() != 0)
{
this.getAvmService().setNodeProperty(path, ContentModel.PROP_TITLE,
new PropertyValue(DataTypeDefinition.TEXT, this.title));
}
if (this.description != null && this.description.length() != 0)
{
this.getAvmService().setNodeProperty(path, ContentModel.PROP_DESCRIPTION, new PropertyValue(DataTypeDefinition.TEXT, this.description));
// this.nodeService.setProperty(nodeRef, ContentModel.PROP_DESCRIPTION, this.description);
this.getAvmService().setNodeProperty(path, ContentModel.PROP_DESCRIPTION,
new PropertyValue(DataTypeDefinition.TEXT, this.description));
}
return outcome;