Django

Code

Changeset 7523

Show
Ignore:
Timestamp:
05/10/08 11:18:22 (6 days ago)
Author:
jbronn
Message:

gis: Merged revisions 7514,7520-7521 via svnmerge from trunk.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/gis

    • Property svnmerge-integrated changed from /django/trunk:1-7510 to /django/trunk:1-7522

  • django/branches/gis/django/contrib/admin/views/decorators.py

    r7176 r7523  
    3030    return render_to_response('admin/login.html', { 
    3131        'title': _('Log in'), 
    32         'app_path': mark_safe(request.path), 
     32        'app_path': request.path, 
    3333        'post_data': post_data, 
    3434        'error_message': error_message 

  • django/branches/gis/django/db/backends/oracle/query.py

    r7482 r7523  
    11""" 
    2 Custom Query class for this backend (a derivative of 
    3 django.db.models.sql.query.Query). 
     2Custom Query class for Oracle. 
     3Derives from: django.db.models.sql.query.Query 
    44""" 
    55 
    …… 
    1313def query_class(QueryClass, Database): 
    1414    """ 
    15     Returns a custom djang.db.models.sql.query.Query subclass that is 
    16     appropraite for Oracle. 
     15    Returns a custom django.db.models.sql.query.Query subclass that is 
     16    appropriate for Oracle. 
    1717 
    1818    The 'Database' module (cx_Oracle) is passed in here so that all the setup