Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add study class model to schooling, add custom migration with study classes #46

Merged
merged 3 commits into from
May 17, 2024

Conversation

Mitsushidu
Copy link
Contributor

Добавил модель study class, зарегистировал её в админке, добавил кастомную миграцию с учебными классами

@KonstantinRaikhert
Copy link
Member

@Mitsushidu Обрати внимание, что ты не стянул обновления с dev, поэтому конфликты в ветке
2024-05-16_12-06

@@ -19,6 +19,7 @@ class AdministratorAdmin(UserAdmin):
(None, {
'fields': (
*Administrator.REQUIRED_FIELDS,
Administrator.USERNAME_FIELD,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Это уже неактуально)

'PORT': env.str('POSTGRES_PORT', default='5432'),
'NAME': env('POSTGRES_NAME', default='postgres'),
'USER': env('POSTGRES_USER', default='postgres'),
'PASSWORD': 'postgres',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Так нельзя, мы пароль будем брать с env

@@ -15,9 +15,9 @@

DEFAULT = 'some_default_key'

SECRET_KEY = env.str('SECRET_KEY', default=DEFAULT)
SECRET_KEY = env('SECRET_KEY', default=DEFAULT)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

А почему убрал str?

Copy link
Member

@KonstantinRaikhert KonstantinRaikhert left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Сейчас поплыла статика в админке из-за того, что запуск производим через asgi.
ТВой ПР смержим, пофиксим это дело, и если будут баги по твоей таске - пофиксим

@KonstantinRaikhert KonstantinRaikhert merged commit 05fadd7 into dev May 17, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Реализация сущности StudyClass с фикстурами заполнения в БД
2 participants