~ubuntu-branches/ubuntu/quantal/python-django/quantal-security

« back to all changes in this revision

Viewing changes to tests/regressiontests/admin_views/models.py

  • Committer: Bazaar Package Importer
  • Author(s): Jamie Strandboge
  • Date: 2010-10-12 11:34:35 UTC
  • mfrom: (1.2.7 upstream)
  • mto: This revision was merged to the branch mainline in revision 30.
  • Revision ID: james.westby@ubuntu.com-20101012113435-9lnsrh0i3mxozbt0
Tags: upstream-1.2.3
ImportĀ upstreamĀ versionĀ 1.2.3

Show diffs side-by-side

added added

removed removed

Lines of Context:
10
10
from django.db import models
11
11
from django import forms
12
12
from django.forms.models import BaseModelFormSet
 
13
from django.contrib.auth.models import User
13
14
from django.contrib.contenttypes import generic
14
15
from django.contrib.contenttypes.models import ContentType
15
16
 
579
580
class PizzaAdmin(admin.ModelAdmin):
580
581
    readonly_fields = ('toppings',)
581
582
 
 
583
class Album(models.Model):
 
584
    owner = models.ForeignKey(User)
 
585
    title = models.CharField(max_length=30)
 
586
 
582
587
admin.site.register(Article, ArticleAdmin)
583
588
admin.site.register(CustomArticle, CustomArticleAdmin)
584
589
admin.site.register(Section, save_as=True, inlines=[ArticleInline])
625
630
admin.site.register(ChapterXtra1)
626
631
admin.site.register(Pizza, PizzaAdmin)
627
632
admin.site.register(Topping)
 
633
admin.site.register(Album)