Django

Code

Show
Ignore:
Timestamp:
08/17/07 10:05:54 (1 year ago)
Author:
russellm
Message:

newforms-admin: Merged from trunk up to [5916]

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • django/branches/newforms-admin

    • Property svnmerge-integrated changed from /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-5828 to /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-5916
  • django/branches/newforms-admin/django/core/xheaders.py

    r4090 r5918  
    55This module contains utility functions for retrieving and doing interesting 
    66things with these special "X-Headers" (so called because the HTTP spec demands 
    7 that custom headers are prefxed with "X-"). 
     7that custom headers are prefixed with "X-"). 
    88 
    99Next time you're at slashdot.org, watch out for X-Fry and X-Bender. :) 
     
    1818    """ 
    1919    from django.conf import settings 
    20     if request.META.get('REMOTE_ADDR') in settings.INTERNAL_IPS or (hasattr(request, 'user') and request.user.is_authenticated() and request.user.is_staff): 
     20    if (request.META.get('REMOTE_ADDR') in settings.INTERNAL_IPS 
     21            or (hasattr(request, 'user') and request.user.is_authenticated() 
     22                and request.user.is_staff)): 
    2123        response['X-Object-Type'] = "%s.%s" % (model._meta.app_label, model._meta.object_name.lower()) 
    2224        response['X-Object-Id'] = str(object_id)