mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-04 01:39:20 +00:00
Code Issues 32 Releases Wiki Activity

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

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7523 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Justin Bronn 2008-05-10 16:18:22 +00:00
parent 579c9d4567
commit c3f48762fc
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/contrib/admin/views/decorators.py
View File

@ -29,7 +29,7 @@ def _display_login_form(request, error_message=''):
post_data = _encode_post_data({})
return render_to_response('admin/login.html', {
'title': _('Log in'),
'app_path': mark_safe(request.path),
'app_path': request.path,
'post_data': post_data,
'error_message': error_message
}, context_instance=template.RequestContext(request))

8
django/db/backends/oracle/query.py
View File

@ -1,6 +1,6 @@
"""
Custom Query class for this backend (a derivative of
django.db.models.sql.query.Query).
Custom Query class for Oracle.
Derives from: django.db.models.sql.query.Query
"""
import datetime
@ -12,8 +12,8 @@ _classes = {}
def query_class(QueryClass, Database):
"""
Returns a custom djang.db.models.sql.query.Query subclass that is
appropraite for Oracle.
Returns a custom django.db.models.sql.query.Query subclass that is
appropriate for Oracle.
The 'Database' module (cx_Oracle) is passed in here so that all the setup
required to import it only needs to be done by the calling module.