Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #12999 -- Modified the contenttypes syncdb handler to use db ro…

…uter logic. Thanks to lsbardel for the report.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@12750 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 1db672f34735e0338316062e511aa17d24108524 1 parent e5d23d8
@freakboy3742 freakboy3742 authored
Showing with 4 additions and 5 deletions.
  1. +4 −5 django/contrib/contenttypes/management.py
View
9 django/contrib/contenttypes/management.py
@@ -7,22 +7,21 @@ def update_contenttypes(app, created_models, verbosity=2, **kwargs):
Creates content types for models in the given app, removing any model
entries that no longer have a matching model class.
"""
- db = kwargs['db']
ContentType.objects.clear_cache()
- content_types = list(ContentType.objects.using(db).filter(app_label=app.__name__.split('.')[-2]))
+ content_types = list(ContentType.objects.filter(app_label=app.__name__.split('.')[-2]))
app_models = get_models(app)
if not app_models:
return
for klass in app_models:
opts = klass._meta
try:
- ct = ContentType.objects.using(db).get(app_label=opts.app_label,
- model=opts.object_name.lower())
+ ct = ContentType.objects.get(app_label=opts.app_label,
+ model=opts.object_name.lower())
content_types.remove(ct)
except ContentType.DoesNotExist:
ct = ContentType(name=smart_unicode(opts.verbose_name_raw),
app_label=opts.app_label, model=opts.object_name.lower())
- ct.save(using=db)
+ ct.save()
if verbosity >= 2:
print "Adding content type '%s | %s'" % (ct.app_label, ct.model)
# The presence of any remaining content types means the supplied app has an
Please sign in to comment.
Something went wrong with that request. Please try again.