cco/loops
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into bbmaster

Browse source
This commit is contained in:
Helmut Merz 2012-01-29 17:23:05 +01:00
commit dbf653b900
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
concept.py
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,9 +221,10 @@ 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])
predName = rel.usePredicate if IIsSubtype.providedBy(rel):
if predName and predName != u'standard': predName = rel.usePredicate
predicate = cm[predName] if predName and predName != u'standard':
predicate = cm[predName]
return predicate return predicate
def assignChild(self, concept, predicate=None, order=0, relevance=1.0): def assignChild(self, concept, predicate=None, order=0, relevance=1.0):