inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-29 15:21:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

Browse Source 
108046: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud)
      107741: MNT-13820 "Model can be deactivated with a node referencing the model is in trashcan"
         Fix automatic merge error in 107731 - compile fails.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@108077 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-07-09 22:13:16 +00:00
parent d2742fc893
commit 8b4a283ba0
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/java/org/alfresco/repo/dictionary/ModelValidatorImpl.java
View File

@@ -110,7 +110,6 @@ public class ModelValidatorImpl implements ModelValidator
} }
} }
* @param modelName
private boolean canDeleteModel(Collection<NamespaceDefinition> namespaceDefs, Collection<TypeDefinition> typeDefs, private boolean canDeleteModel(Collection<NamespaceDefinition> namespaceDefs, Collection<TypeDefinition> typeDefs,
Collection<AspectDefinition> aspectDefs, Tenant tenant) Collection<AspectDefinition> aspectDefs, Tenant tenant)
{ {
@@ -244,7 +243,6 @@ public class ModelValidatorImpl implements ModelValidator
} }
} }
} }
* @param compiledModel
private void validateDeleteProperty(QName modelName, QName propertyQName, boolean sharedModel) private void validateDeleteProperty(QName modelName, QName propertyQName, boolean sharedModel)
{ {