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

# These URLs are normally mapped to /admin/urls.py. This URLs file is 

     2

# provided as a convenience to those who want to deploy these URLs elsewhere.

     3

# This file is also used to provide a reliable view deployment for test purposes.

     4

     5

from django.conf.urls.defaults import *

     6

     7

urlpatterns = patterns('',

     8

    (r'^login/$', 'django.contrib.auth.views.login'),

     9

    (r'^logout/$', 'django.contrib.auth.views.logout'),

    10

    (r'^password_change/$', 'django.contrib.auth.views.password_change'),

    11

    (r'^password_change/done/$', 'django.contrib.auth.views.password_change_done'),

    12

    (r'^password_reset/$', 'django.contrib.auth.views.password_reset'),

    13

    (r'^password_reset/done/$', 'django.contrib.auth.views.password_reset_done'),

    14

    (r'^reset/(?P<uidb36>[0-9A-Za-z]+)-(?P<token>.+)/$', 'django.contrib.auth.views.password_reset_confirm'),

    15

    (r'^reset/done/$', 'django.contrib.auth.views.password_reset_complete'),

    16

)

    17