mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merged V3.1 to HEAD
13409: Fix for ETHREEOH-1337 - to escape query characters in Site/People service filter methods. 13410: Fix for ETHREEOH-1272 - another missing pager control. 13425: Italian lang pack for TinyMCE editors. Fixes ETHREEOH-1491. 13430: Fix for ETHREEOH-1488. Also IDs added to a couple of pagers - not causing a bug, but completes the pager fixes. 13464: Fix for ETHREEOH-1474 - now possible to use NTLM auth with Alfresco and SURF apps hosted in same app-server with same user browser session in different tabs. Added additional NTLM filter debugging info for Session ID. 13483: Fix for ETHREEOH-1547 - System error happens when trying to create any Web Project. Also fixes issue where webproject FormImpl objects did not deserialize correctly due to unsafe service call usage in constructor. 13501: Fix for ETHREEOH-965 - disallow guest login until explicit Guest support is added to Share. 13507: Fix for ETHREEOH-1586 - language selectable at login working again. 13512: Fix for ETHREEOH-1522 - wiki RSS feed template variable named incorrectly. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13598 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -66,7 +66,7 @@ import freemarker.template.SimpleHash;
|
||||
|
||||
public class FormImpl implements Form
|
||||
{
|
||||
private static final long serialVersionUID = 1L;
|
||||
private static final long serialVersionUID = 7654769105419391840L;
|
||||
|
||||
private static final Log LOGGER = LogFactory.getLog(FormImpl.class);
|
||||
|
||||
@@ -74,15 +74,14 @@ public class FormImpl implements Form
|
||||
private transient FormsService formsService;
|
||||
private transient Map<String, RenderingEngineTemplate> renderingEngineTemplates;
|
||||
|
||||
private final static LinkedList<FormProcessor> PROCESSORS =
|
||||
new LinkedList<FormProcessor>();
|
||||
private final static LinkedList<FormProcessor> PROCESSORS = new LinkedList<FormProcessor>();
|
||||
|
||||
static
|
||||
{
|
||||
FormImpl.PROCESSORS.add(new XFormsProcessor());
|
||||
}
|
||||
|
||||
protected FormImpl(final NodeRef folderNodeRef,
|
||||
final FormsService formsService)
|
||||
protected FormImpl(final NodeRef folderNodeRef, final FormsService formsService)
|
||||
{
|
||||
if (folderNodeRef == null)
|
||||
{
|
||||
@@ -92,12 +91,6 @@ public class FormImpl implements Form
|
||||
{
|
||||
throw new NullPointerException();
|
||||
}
|
||||
final NodeService nodeService = this.getServiceRegistry().getNodeService();
|
||||
if (!nodeService.hasAspect(folderNodeRef, WCMAppModel.ASPECT_FORM))
|
||||
{
|
||||
throw new IllegalArgumentException("node " + folderNodeRef +
|
||||
" does not have aspect " + WCMAppModel.ASPECT_FORM);
|
||||
}
|
||||
this.folderNodeRef = folderNodeRef;
|
||||
this.formsService = formsService;
|
||||
}
|
||||
|
Reference in New Issue
Block a user