test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #12339 -- Made content type deletion an interactive process to prevent accidentally cascade deleting content from a production database. Thanks to kcarnold for the report and patch. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@12782 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Russell Keith-Magee 2010-03-15 09:57:57 +00:00
parent beca4b8109
commit 45a56e637e
1 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
django/contrib/contenttypes/management.py
View File

@ -25,16 +25,34 @@ def update_contenttypes(app, created_models, verbosity=2, **kwargs):
if verbosity >= 2: if verbosity >= 2:
print "Adding content type '%s | %s'" % (ct.app_label, ct.model) print "Adding content type '%s | %s'" % (ct.app_label, ct.model)
# The presence of any remaining content types means the supplied app has an # The presence of any remaining content types means the supplied app has an
# undefined model and can safely be removed, which cascades to also remove # undefined model. Confirm that the content type is stale before deletion.
# related permissions. if content_types:
for ct in content_types: if kwargs.get('interactive', False):
if verbosity >= 2: content_type_display = '\n'.join([' %s | %s' % (ct.app_label, ct.model) for ct in content_types])
print "Deleting stale content type '%s | %s'" % (ct.app_label, ct.model) ok_to_delete = raw_input("""The following content types are stale and need to be deleted:
ct.delete()
def update_all_contenttypes(verbosity=2): %s
Any objects related to these content types by a foreign key will also
be deleted. Are you sure you want to delete these content types?
If you're unsure, answer 'no'.
Type 'yes' to continue, or 'no' to cancel: """ % content_type_display)
else:
ok_to_delete = False
if ok_to_delete == 'yes':
for ct in content_types:
if verbosity >= 2:
print "Deleting stale content type '%s | %s'" % (ct.app_label, ct.model)
ct.delete()
else:
if verbosity >= 2:
print "Stale content types remain."
def update_all_contenttypes(verbosity=2, **kwargs):
for app in get_apps(): for app in get_apps():
update_contenttypes(app, None, verbosity) update_contenttypes(app, None, verbosity, **kwargs)
signals.post_syncdb.connect(update_contenttypes) signals.post_syncdb.connect(update_contenttypes)