Update
svn: r2847
This commit is contained in:
parent
2e9976510b
commit
6943ee0013
@ -360,8 +360,8 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
|
|||||||
return ("spouse",[])
|
return ("spouse",[])
|
||||||
|
|
||||||
try:
|
try:
|
||||||
self.apply_filter(orig_person.get_id(),0,firstList,firstMap)
|
self.apply_filter(orig_person,0,firstList,firstMap)
|
||||||
self.apply_filter(other_person.get_id(),0,secondList,secondMap)
|
self.apply_filter(other_person,0,secondList,secondMap)
|
||||||
except RuntimeError,msg:
|
except RuntimeError,msg:
|
||||||
return (_("Relationship loop detected"),None)
|
return (_("Relationship loop detected"),None)
|
||||||
|
|
||||||
@ -437,8 +437,8 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
|
|||||||
return ('', [])
|
return ('', [])
|
||||||
|
|
||||||
try:
|
try:
|
||||||
self.apply_filter(orig_person.get_id(),0,firstList,firstMap)
|
self.apply_filter(orig_person,0,firstList,firstMap)
|
||||||
self.apply_filter(other_person.get_id(),0,secondList,secondMap)
|
self.apply_filter(other_person,0,secondList,secondMap)
|
||||||
except RuntimeError,msg:
|
except RuntimeError,msg:
|
||||||
return (_("Relationship loop detected"),None)
|
return (_("Relationship loop detected"),None)
|
||||||
|
|
||||||
|
@ -221,8 +221,8 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
|
|||||||
return ("spouse",[])
|
return ("spouse",[])
|
||||||
|
|
||||||
try:
|
try:
|
||||||
self.apply_filter(orig_person.get_id(),0,firstList,firstMap)
|
self.apply_filter(orig_person,0,firstList,firstMap)
|
||||||
self.apply_filter(other_person.get_id(),0,secondList,secondMap)
|
self.apply_filter(other_person,0,secondList,secondMap)
|
||||||
except RuntimeError,msg:
|
except RuntimeError,msg:
|
||||||
return (_("Relationship loop detected"),None)
|
return (_("Relationship loop detected"),None)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user