Merge branch 'shipherd_hotfix'

[philo.git] / contrib / shipherd / models.py

diff --git a/contrib/shipherd/models.py b/contrib/shipherd/models.py
index bddaef3..654f5f8 100644 (file)
--- a/contrib/shipherd/models.py
+++ b/contrib/shipherd/models.py
@@ -148,19 +148,19 @@ class NavigationManager(models.Manager):
                # about that. TODO: Benchmark it.
                caches = self.__class__._cache[self.db][node].values()
                
                # about that. TODO: Benchmark it.
                caches = self.__class__._cache[self.db][node].values()
                

-               items = []
+               target_pks = set()

                
                for cache in caches:
                
                for cache in caches:

-                       items += cache['items']
+                       target_pks |= set([item.target_node_id for item in cache['items']])

                
                # A distinct query is not strictly necessary. TODO: benchmark the efficiency
                # with/without distinct.
                
                # A distinct query is not strictly necessary. TODO: benchmark the efficiency
                # with/without distinct.

-               #change to navigation_navigation_items
-               targets = list(Node.objects.filter(navigation_items__in=items).distinct())
+               targets = list(Node.objects.filter(pk__in=target_pks).distinct())

                
                for cache in caches:
                        for item in cache['items']:
                
                for cache in caches:
                        for item in cache['items']:

-                               item.target_node = targets[targets.index(item.target_node)]
+                               if item.target_node_id:
+                                       item.target_node = targets[targets.index(item.target_node)]

        
        def clear_cache(self):
                self.__class__._cache.pop(self.db, None)
        
        def clear_cache(self):
                self.__class__._cache.pop(self.db, None)


@@ -170,7 +170,7 @@ class Navigation(Entity):
        objects = NavigationManager()
        
        node = models.ForeignKey(Node, related_name='navigation_set', help_text="Be available as navigation for this node.")
        objects = NavigationManager()
        
        node = models.ForeignKey(Node, related_name='navigation_set', help_text="Be available as navigation for this node.")

-       key = models.CharField(max_length=255, validators=[RegexValidator("\w+")], help_text="Must contain one or more alphanumeric characters or underscores.")
+       key = models.CharField(max_length=255, validators=[RegexValidator("\w+")], help_text="Must contain one or more alphanumeric characters or underscores.", db_index=True)

        depth = models.PositiveSmallIntegerField(default=DEFAULT_NAVIGATION_DEPTH, validators=[MinValueValidator(1)], help_text="Defines the maximum display depth of this navigation.")
        
        def __init__(self, *args, **kwargs):
        depth = models.PositiveSmallIntegerField(default=DEFAULT_NAVIGATION_DEPTH, validators=[MinValueValidator(1)], help_text="Defines the maximum display depth of this navigation.")
        
        def __init__(self, *args, **kwargs):