объединил ветки и поправил verbose_name
This commit is contained in:
parent
a3fd7cc11c
commit
9d5e1b9666
@ -5,30 +5,30 @@ from django.core.validators import MinValueValidator
|
|||||||
class Auditorium(Model):
|
class Auditorium(Model):
|
||||||
number = CharField(
|
number = CharField(
|
||||||
max_length=20,
|
max_length=20,
|
||||||
verbose_name='номер кинозала',
|
verbose_name='Номер кинозала',
|
||||||
)
|
)
|
||||||
row_count = IntegerField(
|
row_count = IntegerField(
|
||||||
verbose_name='количество рядов кресел в зале',
|
verbose_name='Количество рядов кресел в зале',
|
||||||
validators=[
|
validators=[
|
||||||
MinValueValidator(1),
|
MinValueValidator(1),
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
db_table = "timetable_auditoriums"
|
db_table = 'timetable_auditoriums'
|
||||||
verbose_name = "Зал"
|
verbose_name = 'Зал'
|
||||||
verbose_name_plural = "Залы"
|
verbose_name_plural = 'Залы'
|
||||||
|
|
||||||
|
|
||||||
class Rows(Model):
|
class Rows(Model):
|
||||||
row_number = IntegerField(
|
row_number = IntegerField(
|
||||||
verbose_name='номер ряда',
|
verbose_name='Номер ряда',
|
||||||
validators=[
|
validators=[
|
||||||
MinValueValidator(1),
|
MinValueValidator(1),
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
column_count = IntegerField(
|
column_count = IntegerField(
|
||||||
verbose_name='количество кресел в ряду',
|
verbose_name='Количество кресел в ряду',
|
||||||
validators=[
|
validators=[
|
||||||
MinValueValidator(1),
|
MinValueValidator(1),
|
||||||
],
|
],
|
||||||
@ -36,11 +36,11 @@ class Rows(Model):
|
|||||||
auditorium = OneToOneField(
|
auditorium = OneToOneField(
|
||||||
Auditorium,
|
Auditorium,
|
||||||
on_delete=CASCADE,
|
on_delete=CASCADE,
|
||||||
verbose_name="зал",
|
verbose_name='зал',
|
||||||
related_name="rows",
|
related_name='rows',
|
||||||
)
|
)
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
db_table = "timetable_rows"
|
db_table = 'timetable_rows'
|
||||||
verbose_name = "Место"
|
verbose_name = 'Место'
|
||||||
verbose_name_plural = "Места"
|
verbose_name_plural = 'Места'
|
||||||
|
|||||||
@ -13,24 +13,24 @@ class Profile(Model):
|
|||||||
|
|
||||||
user = OneToOneField(
|
user = OneToOneField(
|
||||||
settings.AUTH_USER_MODEL,
|
settings.AUTH_USER_MODEL,
|
||||||
verbose_name='пользователь',
|
verbose_name='Пользователь',
|
||||||
related_name='profile',
|
related_name='profile',
|
||||||
related_query_name='profile',
|
related_query_name='profile',
|
||||||
on_delete=CASCADE,
|
on_delete=CASCADE,
|
||||||
)
|
)
|
||||||
birthday = DateField(
|
birthday = DateField(
|
||||||
verbose_name='дата рождения пользователя',
|
verbose_name='Дата рождения пользователя',
|
||||||
null=True,
|
null=True,
|
||||||
blank=True,
|
blank=True,
|
||||||
)
|
)
|
||||||
role = CharField(
|
role = CharField(
|
||||||
verbose_name='роль пользователя',
|
verbose_name='Роль пользователя',
|
||||||
max_length=20,
|
max_length=20,
|
||||||
)
|
)
|
||||||
image = ImageField(
|
image = ImageField(
|
||||||
null=True,
|
null=True,
|
||||||
blank=True,
|
blank=True,
|
||||||
verbose_name="аватар пользователя",
|
verbose_name='Аватар пользователя',
|
||||||
upload_to=get_upload_path,
|
upload_to=get_upload_path,
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -56,6 +56,6 @@ class Profile(Model):
|
|||||||
list_display = ['image_tmb']
|
list_display = ['image_tmb']
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
verbose_name = 'данные пользователя'
|
verbose_name = 'Данные пользователя'
|
||||||
verbose_name_plural = 'данные пользователей'
|
verbose_name_plural = 'Данные пользователей'
|
||||||
db_table = "users_profiles"
|
db_table = 'users_profiles'
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user