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.contrib import admin

     2

from django.conf import settings

     3

from django.contrib.comments.models import Comment

     4

from django.utils.translation import ugettext_lazy as _

     5

     6

class CommentsAdmin(admin.ModelAdmin):

     7

    fieldsets = (

     8

        (None,

     9

           {'fields': ('content_type', 'object_pk', 'site')}

    10

        ),

    11

        (_('Content'),

    12

           {'fields': ('user', 'user_name', 'user_email', 'user_url', 'comment')}

    13

        ),

    14

        (_('Metadata'),

    15

           {'fields': ('submit_date', 'ip_address', 'is_public', 'is_removed')}

    16

        ),

    17

     )

    18

    19

    list_display = ('name', 'content_type', 'object_pk', 'ip_address', 'submit_date', 'is_public', 'is_removed')

    20

    list_filter = ('submit_date', 'site', 'is_public', 'is_removed')

    21

    date_hierarchy = 'submit_date'

    22

    ordering = ('-submit_date',)

    23

    search_fields = ('comment', 'user__username', 'user_name', 'user_email', 'user_url', 'ip_address')

    24

    25

admin.site.register(Comment, CommentsAdmin)