Changeset 522

Timestamp:

02/02/10 11:23:10 (5 weeks ago)

Author:

olivier

Message:

add direct boolean argument to Location ancestors() and descendants()

Files:

• trunk/telemeta/models/crem.py (modified) (3 diffs)

trunk/telemeta/models/crem.py

@@ -39 +39 @@
 from telemeta.util.unaccent import unaccent_icmp
 import re
-from django.db.models import FieldDoesNotExist
+from django.db.models import FieldDoesNotExist, Q
 from telemeta.models.core import DurationField, Duration, WeakForeignKey, EnhancedModel, \
                                  CharField, TextField, IntegerField, BooleanField, \
@@ -571 +571 @@
         return MediaCollection.objects.by_location(self)
 
-    def ancestors(self):
-        return Location.objects.filter(descendant_relations__location=self)
-
-    def descendants(self):
-        return Location.objects.filter(ancestor_relations__ancestor_location=self)
+    def ancestors(self, direct=False):
+        q = Q(descendant_relations__location=self)
+        if direct:
+            q &= Q(descendant_relations__is_direct=True)
+        return Location.objects.filter(q)           
+
+    def descendants(self, direct=False):
+        q = Q(ancestor_relations__ancestor_location=self)
+        if direct:
+            q &= Q(ancestor_relations__is_direct=True)
+        return Location.objects.filter(q)           
 
     def add_child(self, other):
@@ -658 +664 @@
         db_table = 'location_relations'
         unique_together = ('location', 'ancestor_location')
+
+    def __unicode__(self):
+        sep = ' > '
+        if not self.is_direct:
+            sep = ' >..> ' 
+        return unicode(self.ancestor_location) + sep + unicode(self.location)
     
 class ContextKeyword(Enumeration):