mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
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:
@@ -36,6 +36,7 @@ import javax.faces.context.FacesContext;
|
||||
import javax.faces.event.ActionEvent;
|
||||
import javax.faces.model.DataModel;
|
||||
import javax.faces.model.ListDataModel;
|
||||
import javax.faces.model.SelectItem;
|
||||
|
||||
import org.alfresco.model.ApplicationModel;
|
||||
import org.alfresco.model.ContentModel;
|
||||
@@ -116,6 +117,7 @@ public class CreateWebsiteWizard extends BaseWizardBean
|
||||
protected String createFrom = null;
|
||||
protected String[] sourceWebProject = null;
|
||||
protected ExpiringValueCache<List<UIListItem>> webProjectsList;
|
||||
protected List<SelectItem> webappsList;
|
||||
protected boolean isSource;
|
||||
protected boolean showAllSourceProjects;
|
||||
|
||||
@@ -941,6 +943,21 @@ public class CreateWebsiteWizard extends BaseWizardBean
|
||||
return this.showAllSourceProjects;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return List of SelectItem objects representing the webapp folders present in the project
|
||||
*/
|
||||
public List<SelectItem> getWebappsList()
|
||||
{
|
||||
if (this.webappsList == null)
|
||||
{
|
||||
this.webappsList = new ArrayList<SelectItem>(1);
|
||||
|
||||
this.webappsList.add(new SelectItem(WEBAPP_DEFAULT, WEBAPP_DEFAULT));
|
||||
}
|
||||
|
||||
return this.webappsList;
|
||||
}
|
||||
|
||||
/**
|
||||
* @see org.alfresco.web.bean.wizard.BaseWizardBean#next()
|
||||
*/
|
||||
|
Reference in New Issue
Block a user