Django

Code

Changeset 933

Show
Ignore:
Timestamp:
10/18/05 07:39:07 (3 years ago)
Author:
rjwittams
Message:

Merged to r631.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/new-admin/django/conf/urls/admin.py

    r740 r933  
    33 
    44urlpatterns = ( 
    5     ('^$', 'django.views.admin.main.index'), 
     5    ('^$', 'django.contrib.admin.views.main.index'), 
    66    ('^logout/$', 'django.views.auth.login.logout'), 
    77    ('^password_change/$', 'django.views.registration.passwords.password_change'), 
    88    ('^password_change/done/$', 'django.views.registration.passwords.password_change_done'), 
    9     ('^template_validator/$', 'django.views.admin.template.template_validator'), 
     9    ('^template_validator/$', 'django.contrib.admin.views.template.template_validator'), 
    1010 
    1111    # Documentation 
    12     ('^doc/$', 'django.views.admin.doc.doc_index'), 
    13     ('^doc/bookmarklets/$', 'django.views.admin.doc.bookmarklets'), 
    14     ('^doc/tags/$', 'django.views.admin.doc.template_tag_index'), 
    15     ('^doc/filters/$', 'django.views.admin.doc.template_filter_index'), 
    16     ('^doc/views/$', 'django.views.admin.doc.view_index'), 
    17     ('^doc/views/jump/$', 'django.views.admin.doc.jump_to_view'), 
    18     ('^doc/views/(?P<view>[^/]+)/$', 'django.views.admin.doc.view_detail'), 
    19     ('^doc/models/$', 'django.views.admin.doc.model_index'), 
    20     ('^doc/models/(?P<model>[^/]+)/$', 'django.views.admin.doc.model_detail'), 
     12    ('^doc/$', 'django.contrib.admin.views.doc.doc_index'), 
     13    ('^doc/bookmarklets/$', 'django.contrib.admin.views.doc.bookmarklets'), 
     14    ('^doc/tags/$', 'django.contrib.admin.views.doc.template_tag_index'), 
     15    ('^doc/filters/$', 'django.contrib.admin.views.doc.template_filter_index'), 
     16    ('^doc/views/$', 'django.contrib.admin.views.doc.view_index'), 
     17    ('^doc/views/jump/$', 'django.contrib.admin.views.doc.jump_to_view'), 
     18    ('^doc/views/(?P<view>[^/]+)/$', 'django.contrib.admin.views.doc.view_detail'), 
     19    ('^doc/models/$', 'django.contrib.admin.views.doc.model_index'), 
     20    ('^doc/models/(?P<model>[^/]+)/$', 'django.contrib.admin.views.doc.model_detail'), 
    2121#    ('^doc/templates/$', 'django.views.admin.doc.template_index'), 
    22     ('^doc/templates/(?P<template>.*)/$', 'django.views.admin.doc.template_detail'), 
     22    ('^doc/templates/(?P<template>.*)/$', 'django.contrib.admin.views.doc.template_detail'), 
    2323) 
    2424 
    …… 
    4949urlpatterns += ( 
    5050    # Metasystem admin pages 
    51     ('^(?P<app_label>[^/]+)/(?P<module_name>[^/]+)/add_old/$', 'django.views.admin.main.add_stage'), 
    52     ('^(?P<app_label>[^/]+)/(?P<module_name>[^/]+)/(?P<object_id>.+)_old/$', 'django.views.admin.main.change_stage'), 
    53     ('^(?P<app_label>[^/]+)/(?P<module_name>[^/]+)/$', 'django.views.admin.main.change_list'), 
    54     ('^(?P<app_label>[^/]+)/(?P<module_name>[^/]+)/add/$', 'django.views.admin.main.add_stage_new'), 
    55     ('^(?P<app_label>[^/]+)/(?P<module_name>[^/]+)/jsvalidation/$', 'django.views.admin.jsvalidation.jsvalidation'), 
    56     ('^(?P<app_label>[^/]+)/(?P<module_name>[^/]+)/(?P<object_id>.+)/history/$', 'django.views.admin.main.history'), 
    57     ('^(?P<app_label>[^/]+)/(?P<module_name>[^/]+)/(?P<object_id>.+)/delete/$', 'django.views.admin.main.delete_stage'), 
    58     ('^(?P<app_label>[^/]+)/(?P<module_name>[^/]+)/(?P<object_id>.+)/$', 'django.views.admin.main.change_stage_new'), 
     51    ('^(?P<app_label>[^/]+)/(?P<module_name>[^/]+)/add_old/$', 'django.contrib.admin.views.main.add_stage'), 
     52    ('^(?P<app_label>[^/]+)/(?P<module_name>[^/]+)/(?P<object_id>.+)_old/$', 'django.contrib.admin.views.main.change_stage'), 
     53    ('^(?P<app_label>[^/]+)/(?P<module_name>[^/]+)/$', 'django.contrib.admin.views.main.change_list'), 
     54    ('^(?P<app_label>[^/]+)/(?P<module_name>[^/]+)/add/$', 'django.contrib.admin.views.main.add_stage_new'), 
     55    ('^(?P<app_label>[^/]+)/(?P<module_name>[^/]+)/(?P<object_id>.+)/history/$', 'django.contrib.admin.views.main.history'), 
     56    ('^(?P<app_label>[^/]+)/(?P<module_name>[^/]+)/(?P<object_id>.+)/delete/$', 'django.contrib.admin.views.main.delete_stage'), 
     57    ('^(?P<app_label>[^/]+)/(?P<module_name>[^/]+)/(?P<object_id>.+)/$', 'django.contrib.admin.views.main.change_stage_new'), 
    5958) 
    6059urlpatterns = patterns('', *urlpatterns) 

  • django/branches/new-admin/django/contrib/admin/views/doc.py

    r923 r933  
    22from django import templatetags 
    33from django.conf import settings 
     4from django.contrib.admin.views.decorators import staff_member_required 
    45from django.models.core import sites 
    56from django.core.extensions import DjangoContext, render_to_response 
    …… 
    2021        return missing_docutils_page(request) 
    2122    return render_to_response('doc/index', context_instance=DjangoContext(request)) 
     23doc_index = staff_member_required(doc_index) 
    2224 
    2325def bookmarklets(request): 
    …… 
    2527        'admin_url' : "%s://%s" % (os.environ.get('HTTPS') == 'on' and 'https' or 'http', request.META['HTTP_HOST']), 
    2628    }, context_instance=DjangoContext(request)) 
     29bookmarklets = staff_member_required(bookmarklets) 
    2730 
    2831def template_tag_index(request): 
    …… 
    6265 
    6366    return render_to_response('doc/template_tag_index', {'tags': tags}, context_instance=DjangoContext(request)) 
     67template_tag_index = staff_member_required(template_tag_index) 
    6468 
    6569def template_filter_index(request): 
    …… 
    9498 
    9599    return render_to_response('doc/template_filter_index', {'filters': filters}, context_instance=DjangoContext(request)) 
     100template_filter_index = staff_member_required(template_filter_index) 
    96101 
    97102def view_index(request): 
    …… 
    113118            }) 
    114119    return render_to_response('doc/view_index', {'views': views}, context_instance=DjangoContext(request)) 
     120view_index = staff_member_required(view_index) 
    115121 
    116122def view_detail(request, view): 
    …… 
    136142        'meta': metadata, 
    137143    }, context_instance=DjangoContext(request)) 
     144view_detail = staff_member_required(view_detail) 
    138145 
    139146def model_index(request): 
    …… 
    151158            }) 
    152159    return render_to_response('doc/model_index', {'models': models}, context_instance=DjangoContext(request)) 
     160model_index = staff_member_required(model_index) 
    153161 
    154162def model_detail(request, model): 
    …… 
    192200        'fields': fields, 
    193201    }, context_instance=DjangoContext(request)) 
     202model_detail = staff_member_required(model_detail) 
    194203 
    195204def template_detail(request, template): 
    …… 
    211220        'templates': templates, 
    212221    }, context_instance=DjangoContext(request)) 
     222template_detail = staff_member_required(template_detail) 
    213223 
    214224#################### 

  • django/branches/new-admin/django/contrib/admin/views/main.py

    r864 r933  
    1 # Generic admin views, with admin templates created dynamically at runtime. 
    2  
    3 from django.core import formfields, meta, template_loader, template 
     1# Generic admin views. 
     2 
     3from django.contrib.admin.views.decorators import staff_member_required 
     4from django.core import formfields, meta, template 
     5from django.core.template import loader 
    46from django.core.meta.fields import BoundField, BoundFieldLine, BoundFieldSet 
    57from django.core.exceptions import Http404, ObjectDoesNotExist, PermissionDenied 
    …… 
    5052def index(request): 
    5153    return render_to_response('index', {'title': 'Site administration'}, context_instance=Context(request)) 
     54index = staff_member_required(index) 
    5255 
    5356def change_list(request, app_label, module_name): 
    …… 
    488491    raw_template.append('</div>\n</div>') 
    489492    raw_template.append('{% endblock %}\n') 
    490     t = template_loader.get_template_from_string(''.join(raw_template)) 
     493    t = loader.get_template_from_string(''.join(raw_template)) 
    491494    c = Context(request, { 
    492495        'title': (is_popup and 'Select %s' % opts.verbose_name or 'Select %s to change' % opts.verbose_name), 
    …… 
    494497    }) 
    495498    return HttpResponse(t.render(c)) 
     499change_list = staff_member_required(change_list) 
    496500 
    497501use_raw_id_admin = lambda field: isinstance(field.rel, (meta.ManyToOne, meta.ManyToMany)) and field.rel.raw_id_admin 
    …… 
    722726    
    723727    return render_to_response("admin_change_form", context_instance=c)  
    724  
     728add_stage_new = staff_member_required(add_stage_new) 
    725729 
    726730 
    …… 
    818822    fill_extra_context(opts, app_label, c, change=True) 
    819823     
    820     #t = template_loader.get_template_from_string(raw_template) 
    821      
    822824    return render_to_response('admin_change_form', context_instance=c); 
    823  
     825change_stage_new = staff_member_required(change_stage_new) 
    824826 
    825827def _get_template(opts, app_label, add=False, change=False, show_delete=False, form_url=''): 
    …… 
    11451147        c['object_id'] = object_id_override 
    11461148    raw_template = _get_template(opts, app_label, add=True, show_delete=show_delete, form_url=form_url) 
    1147     t = template_loader.get_template_from_string(raw_template) 
     1149    t = loader.get_template_from_string(raw_template) 
    11481150    return HttpResponse(t.render(c)) 
     1151add_stage = staff_member_required(add_stage) 
    11491152 
    11501153def change_stage(request, app_label, module_name, object_id): 
    …… 
    12721275    raw_template = _get_template(opts, app_label, change=True) 
    12731276#     return HttpResponse(raw_template, mimetype='text/plain') 
    1274     t = template_loader.get_template_from_string(raw_template) 
     1277    t = loader.get_template_from_string(raw_template) 
    12751278    return HttpResponse(t.render(c)) 
     1279change_stage = staff_member_required(change_stage) 
    12761280 
    12771281def _nest_help(obj, depth, val): 
    …… 
    13851389        "perms_lacking": perms_needed, 
    13861390    }, context_instance=Context(request)) 
     1391delete_stage = staff_member_required(delete_stage) 
    13871392 
    13881393def history(request, app_label, module_name, object_id): 
    …… 
    13981403        'object': obj, 
    13991404    }, context_instance=Context(request)) 
     1405history = staff_member_required(history) 

  • django/branches/new-admin/django/contrib/admin/views/template.py

    r923 r933  
     1from django.contrib.admin.views.decorators import staff_member_required 
    12from django.core import formfields, validators 
    23from django.core import template 
    …… 
    2728        'form': formfields.FormWrapper(manipulator, new_data, errors), 
    2829    }, context_instance=DjangoContext(request)) 
     30template_validator = staff_member_required(template_validator) 
    2931 
    3032class TemplateValidator(formfields.Manipulator): 

  • django/branches/new-admin/django/templatetags/admin_modify.py

    r876 r933  
    88from django.core.template.decorators import simple_tag, inclusion_tag 
    99 
    10 from django.views.admin.main import AdminBoundField 
     10from django.contrib.admin.views.main import AdminBoundField 
    1111from django.core.meta.fields import BoundField, Field 
    1212import re