inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-24 17:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V2.1 to HEAD

Browse Source 
6499: Duplicate FK removal script fix
   6593: Full export/import aspect missing fix
   6673: AR-1731JavaScript processTemplate()


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6714 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2007-09-10 11:57:39 +00:00
parent 3b58addf08
commit 5f5a4ac052
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/alfresco/dbscripts/upgrade/2.1/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoSchemaUpdate-2.1-FKIndexes.sql
View File

@@ -9,7 +9,7 @@
-- The MySQL InnoDB Dialect has special support for foreign keys. -- The MySQL InnoDB Dialect has special support for foreign keys.
-- Remove pointless duplicated FK indexes -- Remove pointless duplicated FK indexes
ALTER TABLE alf_global_attributes DROP INDEX FK64D0B9CF69B9F16A; ALTER TABLE alf_global_attributes DROP INDEX FK64D0B9CF69B9F16A;(optional)
-- --
-- Record script finish -- Record script finish

4
source/java/org/alfresco/repo/importer/view/NodeContext.java
View File

@@ -421,8 +421,8 @@ public class NodeContext extends ElementContext
*/ */
public AspectDefinition determineAspect(QName defName) public AspectDefinition determineAspect(QName defName)
{ {
AspectDefinition def = null; AspectDefinition def = nodeAspects.get(defName);
if (nodeAspects.containsKey(defName) == false) if (def == null)
{ {
def = getDictionaryService().getAspect(defName); def = getDictionaryService().getAspect(defName);
} }

6
source/java/org/alfresco/repo/processor/TemplateServiceImpl.java
View File

@@ -78,7 +78,11 @@ public class TemplateServiceImpl implements TemplateService
* @see org.alfresco.service.cmr.repository.TemplateService#getTemplateProcessor(java.lang.String) * @see org.alfresco.service.cmr.repository.TemplateService#getTemplateProcessor(java.lang.String)
*/ */
public TemplateProcessor getTemplateProcessor(String engine) public TemplateProcessor getTemplateProcessor(String engine)
{ {
if (engine == null)
{
engine = this.defaultTemplateEngine;
}
return this.processors.get(engine); return this.processors.get(engine);
} }