← Back to branch summary

~ubuntu-branches/ubuntu/quantal/python-django/quantal-security

« back to all changes in this revision

Viewing changes to django/core/xheaders.py

  • Committer: Bazaar Package Importer
  • Author(s): Chris Lamb
  • Date: 2010-05-21 07:52:55 UTC
  • mfrom: (1.3.6 upstream)
  • mto: This revision was merged to the branch mainline in revision 28.
  • Revision ID: james.westby@ubuntu.com-20100521075255-ii78v1dyfmyu3uzx
Tags: upstream-1.2
Import upstream version 1.2

Show diffs side-by-side

added added

removed removed

Lines of Context:
django/core/xheaders.py
18
18
    """
19
19
    from django.conf import settings
20
20
    if (request.META.get('REMOTE_ADDR') in settings.INTERNAL_IPS
21
 
            or (hasattr(request, 'user') and request.user.is_authenticated()
 
21
            or (hasattr(request, 'user') and request.user.is_active
22
22
                and request.user.is_staff)):
23
23
        response['X-Object-Type'] = "%s.%s" % (model._meta.app_label, model._meta.object_name.lower())
24
24
        response['X-Object-Id'] = str(object_id)