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.http import Http404

     2

from django.shortcuts import render_to_response

     3

     4

###########

     5

# CHOICES #

     6

###########

     7

     8

def choice_list(request, app_label, module_name, field_name, models):

     9

    m, f = lookup_field(app_label, module_name, field_name, models)

    10

    return render_to_response('databrowse/choice_list.html', {'model': m, 'field': f})

    11

    12

def choice_detail(request, app_label, module_name, field_name, field_val, models):

    13

    m, f = lookup_field(app_label, module_name, field_name, models)

    14

    try:

    15

        label = dict(f.field.choices)[field_val]

    16

    except KeyError:

    17

        raise Http404('Invalid choice value given')

    18

    obj_list = m.objects(**{f.field.name: field_val})

    19

    return render_to_response('databrowse/choice_detail.html', {'model': m, 'field': f, 'value': label, 'object_list': obj_list})