1
0
mirror of https://github.com/django/django.git synced 2025-10-24 14:16:09 +00:00

Followed style guide for model attribute ordering.

This commit is contained in:
Matt Wiens
2018-12-27 16:34:14 -08:00
committed by Tim Graham
parent dd8ed64113
commit e817ae74da
27 changed files with 148 additions and 135 deletions

View File

@@ -15,12 +15,12 @@ class Author(models.Model):
favorite_authors = models.ManyToManyField(
'self', through='FavoriteAuthors', symmetrical=False, related_name='favors_me')
def __str__(self):
return self.name
class Meta:
ordering = ['id']
def __str__(self):
return self.name
class AuthorWithAge(Author):
author = models.OneToOneField(Author, models.CASCADE, parent_link=True)
@@ -50,12 +50,12 @@ class Book(models.Model):
title = models.CharField(max_length=255)
authors = models.ManyToManyField(Author, related_name='books')
def __str__(self):
return self.title
class Meta:
ordering = ['id']
def __str__(self):
return self.title
class BookWithYear(Book):
book = models.OneToOneField(Book, models.CASCADE, parent_link=True)
@@ -78,12 +78,12 @@ class Reader(models.Model):
name = models.CharField(max_length=50)
books_read = models.ManyToManyField(Book, related_name='read_by')
def __str__(self):
return self.name
class Meta:
ordering = ['id']
def __str__(self):
return self.name
class BookReview(models.Model):
# Intentionally does not have a related name.
@@ -122,12 +122,12 @@ class Teacher(models.Model):
objects = TeacherManager()
objects_custom = TeacherQuerySet.as_manager()
def __str__(self):
return "%s (%s)" % (self.name, ", ".join(q.name for q in self.qualifications.all()))
class Meta:
ordering = ['id']
def __str__(self):
return "%s (%s)" % (self.name, ", ".join(q.name for q in self.qualifications.all()))
class Department(models.Model):
name = models.CharField(max_length=50)
@@ -165,12 +165,12 @@ class TaggedItem(models.Model):
favorite_fkey = models.CharField(max_length=64, null=True)
favorite = GenericForeignKey('favorite_ct', 'favorite_fkey')
def __str__(self):
return self.tag
class Meta:
ordering = ['id']
def __str__(self):
return self.tag
class Bookmark(models.Model):
url = models.URLField()
@@ -243,12 +243,12 @@ class Employee(models.Model):
name = models.CharField(max_length=50)
boss = models.ForeignKey('self', models.SET_NULL, null=True, related_name='serfs')
def __str__(self):
return self.name
class Meta:
ordering = ['id']
def __str__(self):
return self.name
# Ticket #19607
@@ -275,12 +275,12 @@ class Author2(models.Model):
first_book = models.ForeignKey('Book', models.CASCADE, related_name='first_time_authors+')
favorite_books = models.ManyToManyField('Book', related_name='+')
def __str__(self):
return self.name
class Meta:
ordering = ['id']
def __str__(self):
return self.name
# Models for many-to-many with UUID pk test: