Introduce dynamic scope_path regexps Instead of relying on scope_path's being "one slash deep", we should instead allow for either: 1. scope_paths that have a pre-defined depth 2. scope_paths that can be arbitrarily deep We achieve 1 by setting an entities scope_logic to another logic module. We then recursively call getScopeDepth until we get to the topmost entity (that is, an unscoped entity). A little different is the solution to 2, since some entities can have an arbitrarily deep scope (such as Documents), we need to have some way of signaling this to getScopePattern. A clean solution is to return None, rather than a number. If None is returned, the SCOPE_PATH_ARG_PATTERN is returned as regexp instead, which will match an arbitrarily deeply nested scope. The solution for 2 requires that we return None somewhere in the scope_logic chain, the most straight forward method to do so is to override getScopeDepth anywhere such a scope is needed and make it return None. A more elegant solution however, is to set the scope_logic to that module in all entities that require it. Patch by: Sverre Rabbelier

     1

from django.db import models

     2

from django.dispatch import dispatcher

     3

from django.contrib.contenttypes.models import ContentType

     4

from django.utils.encoding import force_unicode

     5

     6

class CommentManager(models.Manager):

     7

     8

    def in_moderation(self):

     9

        """

    10

        QuerySet for all comments currently in the moderation queue.

    11

        """

    12

        return self.get_query_set().filter(is_public=False, is_removed=False)

    13

    14

    def for_model(self, model):

    15

        """

    16

        QuerySet for all comments for a particular model (either an instance or

    17

        a class).

    18

        """

    19

        ct = ContentType.objects.get_for_model(model)

    20

        qs = self.get_query_set().filter(content_type=ct)

    21

        if isinstance(model, models.Model):

    22

            qs = qs.filter(object_pk=force_unicode(model._get_pk_val()))

    23

        return qs