mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
. Refactored client AVM Node class to extend existing Node class - allows the use of existing PermissionEvaluators etc. for a node action
. Permission evaluators added to AVM browse screen top-level actions and file/folder actions . Permission evaluators added to Edit Details action in File/Folder Details screens . Each user sandbox is now only visible to the assigned user and all Content Managers . Import Website Content action hidden unless user has appropriate Write permissions to the main staging area (Content Managers only) . Added Titled aspect to shtml content created through the XML Templating Service. . Remove Create Content action from sandbox screen - makes no sense here until we can create via workflow or destination folder . Fix nasty bug in Create Form Wizard where no default extension would be specified - this led to the XForms generating files such as "myfile.xml" and "myfile." - the generated HTML did not have a file extension... git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4048 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -66,6 +66,11 @@ public class CreateXmlContentTypeWizard extends BaseWizardBean
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
private static final String FILE_TEMPLATEOUTPUT = "template-output-method";
|
||||
|
||||
private static final String FILE_SCHEMA = "schema";
|
||||
|
||||
|
||||
/**
|
||||
* Simple wrapper class to represent a template output method
|
||||
*/
|
||||
@@ -204,8 +209,6 @@ public class CreateXmlContentTypeWizard extends BaseWizardBean
|
||||
this.schemaRootTagName = null;
|
||||
this.templateName = null;
|
||||
this.templateOutputMethods = new ArrayList<TemplateOutputMethodData>();
|
||||
clearUpload("schema");
|
||||
clearUpload("template-output-method");
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -275,7 +278,7 @@ public class CreateXmlContentTypeWizard extends BaseWizardBean
|
||||
*/
|
||||
public String removeUploadedSchemaFile()
|
||||
{
|
||||
clearUpload("schema");
|
||||
clearUpload(FILE_SCHEMA);
|
||||
|
||||
// refresh the current page
|
||||
return null;
|
||||
@@ -286,7 +289,7 @@ public class CreateXmlContentTypeWizard extends BaseWizardBean
|
||||
*/
|
||||
public String removeUploadedTemplateOutputMethodFile()
|
||||
{
|
||||
clearUpload("template-output-method");
|
||||
clearUpload(FILE_TEMPLATEOUTPUT);
|
||||
|
||||
// refresh the current page
|
||||
return null;
|
||||
@@ -369,7 +372,7 @@ public class CreateXmlContentTypeWizard extends BaseWizardBean
|
||||
*/
|
||||
public File getSchemaFile()
|
||||
{
|
||||
return this.getFile("schema");
|
||||
return this.getFile(FILE_SCHEMA);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -379,7 +382,7 @@ public class CreateXmlContentTypeWizard extends BaseWizardBean
|
||||
{
|
||||
// try and retrieve the file and filename from the file upload bean
|
||||
// representing the file we previously uploaded.
|
||||
return this.getFileName("schema");
|
||||
return this.getFileName(FILE_SCHEMA);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -387,7 +390,7 @@ public class CreateXmlContentTypeWizard extends BaseWizardBean
|
||||
*/
|
||||
public String getTemplateOutputMethodFileName()
|
||||
{
|
||||
return this.getFileName("template-output-method");
|
||||
return this.getFileName(FILE_TEMPLATEOUTPUT);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -395,7 +398,7 @@ public class CreateXmlContentTypeWizard extends BaseWizardBean
|
||||
*/
|
||||
public File getTemplateOutputMethodFile()
|
||||
{
|
||||
return this.getFile("template-output-method");
|
||||
return this.getFile(FILE_TEMPLATEOUTPUT);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -490,12 +493,12 @@ public class CreateXmlContentTypeWizard extends BaseWizardBean
|
||||
{
|
||||
// remove the file upload bean from the session
|
||||
FacesContext ctx = FacesContext.getCurrentInstance();
|
||||
FileUploadBean fileBean = (FileUploadBean)
|
||||
ctx.getExternalContext().getSessionMap().
|
||||
get(FileUploadBean.getKey(id));
|
||||
FileUploadBean fileBean =
|
||||
(FileUploadBean)ctx.getExternalContext().getSessionMap().get(FileUploadBean.getKey(id));
|
||||
if (fileBean != null)
|
||||
{
|
||||
fileBean.setFile(null);
|
||||
fileBean.setFileName(null);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user