mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-24 22:26:08 +00:00
Code Issues 32 Releases Wiki Activity

[soc2009/multidb] Merged in all of Justin Bronn's GIS work. Multidb should now work fully with GIS. This is backwards incompatible, if you are using GIS, your ENGINE setting should now be django.contrib.gis.db.backends.XXX where XXX is the name of your DB backend. Thanks to Justin for all his work. This also resolves merge conflicts from the previous commit.

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11813 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Alex Gaynor
2009-12-12 02:13:30 +00:00
parent c88113683d
commit 049dc42bde
109 changed files with 2733 additions and 3662 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
docs/topics/auth.txt
View File

@@ -239,14 +239,11 @@ Methods
where each perm is in the format
``"<app label>.<permission codename>"``. If the user is inactive,
this method will always return ``False``.
<<<<<<< HEAD:docs/topics/auth.txt
=======
.. versionadded:: 1.2
If ``obj`` is passed in, this method won't check for permissions for
the model, but for the specific object.
>>>>>>> master:docs/topics/auth.txt
.. method:: models.User.has_module_perms(package_name)