Merge branch 'master' into bbmaster

This commit is contained in:
Helmut Merz 2012-01-29 17:23:05 +01:00
commit dbf653b900

View file

@ -51,6 +51,7 @@ from loops.interfaces import IConcept, IConceptRelation, IConceptView
from loops.interfaces import IConceptManager, IConceptManagerContained from loops.interfaces import IConceptManager, IConceptManagerContained
from loops.interfaces import ILoopsContained from loops.interfaces import ILoopsContained
from loops.interfaces import IIndexAttributes from loops.interfaces import IIndexAttributes
from loops.interfaces import IIsSubtype
from loops.interfaces import IAssignmentEvent, IDeassignmentEvent from loops.interfaces import IAssignmentEvent, IDeassignmentEvent
from loops.security.common import canListObject from loops.security.common import canListObject
from loops import util from loops import util
@ -220,6 +221,7 @@ class Concept(Contained, Persistent):
if subtypeRels: if subtypeRels:
from loops.predicate import adaptedRelation from loops.predicate import adaptedRelation
rel = adaptedRelation(subtypeRels[0]) rel = adaptedRelation(subtypeRels[0])
if IIsSubtype.providedBy(rel):
predName = rel.usePredicate predName = rel.usePredicate
if predName and predName != u'standard': if predName and predName != u'standard':
predicate = cm[predName] predicate = cm[predName]