Django

Code

Ticket #5177: ctremove.2.diff

File ctremove.2.diff, 2.5 kB (added by Rob Hudson <treborhudson@gmail.com>, 1 year ago)

Fixing points 1 through 3 from Malcolm. Point #4 will need more time to ponder.

  • a/AUTHORS

    old new  
    141141    Sung-Jin Hong <serialx.net@gmail.com> 
    142142    Richard House <Richard.House@i-logue.com> 
    143143    Robert Rock Howard <http://djangomojo.com/> 
     144    Rob Hudson <http://rob.cogit8.org/> 
    144145    Jason Huggins <http://www.jrandolph.com/blog/> 
    145146    Hyun Mi Ae 
    146147    Tom Insam 
  • a/django/contrib/contenttypes/management.py

    old new  
    1 """ 
    2 Creates content types for all installed models. 
    3 """ 
    4  
     1from django.contrib.contenttypes.models import ContentType 
    52from django.dispatch import dispatcher 
    63from django.db.models import get_apps, get_models, signals 
    74from django.utils.encoding import smart_unicode 
    85 
    96def create_contenttypes(app, created_models, verbosity=2): 
    10     from django.contrib.contenttypes.models import ContentType 
     7    """ 
     8    Creates content types for models in the given app, removing any models that 
     9    appear to be orphaned. 
     10    """ 
    1111    ContentType.objects.clear_cache() 
     12    content_types = list(ContentType.objects.filter(app_label=app.__name__.split('.')[-2])) 
    1213    app_models = get_models(app) 
    1314    if not app_models: 
    1415        return 
    1516    for klass in app_models: 
    1617        opts = klass._meta 
    1718        try: 
    18             ContentType.objects.get(app_label=opts.app_label, 
    19                 model=opts.object_name.lower()) 
     19            ct = ContentType.objects.get(app_label=opts.app_label, 
     20                                         model=opts.object_name.lower()) 
     21            content_types.remove(ct) 
    2022        except ContentType.DoesNotExist: 
    2123            ct = ContentType(name=smart_unicode(opts.verbose_name_raw), 
    2224                app_label=opts.app_label, model=opts.object_name.lower()) 
    2325            ct.save() 
    2426            if verbosity >= 2: 
    2527                print "Adding content type '%s | %s'" % (ct.app_label, ct.model) 
     28    # The presence of any remaining content types means the supplied app has an 
     29    # undefined model and can safely be removed, which cascades to also remove 
     30    # related permissions. 
     31    for ct in content_types: 
     32        if verbosity >= 2: 
     33            print "Deleting stale content type '%s | %s'" % (ct.app_label, ct.model) 
     34        ct.delete() 
    2635 
    2736def create_all_contenttypes(verbosity=2): 
    2837    for app in get_apps():