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

MIL-107 m2m связь пользователей, направлений и уровней #403

Open
wants to merge 9 commits into
base: dev
Choose a base branch
from

Conversation

Leontiev93
Copy link
Collaborator

No description provided.

Copy link

linear bot commented Mar 3, 2024

Copy link
Collaborator

@Di0niz Di0niz left a comment

Choose a reason for hiding this comment

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

нужно объединить миграции
добавить тесты для открытия форм

src/lizaalert/users/models.py Outdated Show resolved Hide resolved
src/lizaalert/users/models.py Outdated Show resolved Hide resolved
src/lizaalert/users/models.py Outdated Show resolved Hide resolved
src/lizaalert/users/models.py Outdated Show resolved Hide resolved
src/lizaalert/courses/admin.py Show resolved Hide resolved
src/lizaalert/courses/admin.py Outdated Show resolved Hide resolved
src/lizaalert/courses/admin.py Outdated Show resolved Hide resolved
src/lizaalert/users/models.py Outdated Show resolved Hide resolved
@Leontiev93 Leontiev93 requested a review from Di0niz March 5, 2024 20:32
src/lizaalert/courses/admin.py Outdated Show resolved Hide resolved
src/lizaalert/courses/admin.py Show resolved Hide resolved
src/lizaalert/courses/models.py Show resolved Hide resolved
src/lizaalert/users/admin.py Outdated Show resolved Hide resolved
src/lizaalert/users/migrations/0010_auto_20240305_2329.py Outdated Show resolved Hide resolved
src/lizaalert/users/models.py Outdated Show resolved Hide resolved
src/lizaalert/users/models.py Outdated Show resolved Hide resolved
src/lizaalert/users/migrations/0010_auto_20240305_2329.py Outdated Show resolved Hide resolved
src/lizaalert/courses/admin.py Show resolved Hide resolved
src/lizaalert/courses/admin.py Outdated Show resolved Hide resolved
src/lizaalert/users/models.py Show resolved Hide resolved
src/lizaalert/users/migrations/0009_auto_20240312_2151.py Outdated Show resolved Hide resolved
src/lizaalert/users/models.py Show resolved Hide resolved
src/lizaalert/users/migrations/0009_auto_20240312_2151.py Outdated Show resolved Hide resolved
src/lizaalert/courses/admin.py Outdated Show resolved Hide resolved
@Di0niz
Copy link
Collaborator

Di0niz commented Mar 13, 2024

для решения конфликтов, проще всего сделать новую ветку и туда перенести изменения.

@Leontiev93 Leontiev93 requested a review from Di0niz March 13, 2024 20:56
"author",
"updated_at",
)
list_display = ("title", "author", "created_at", "updated_at")
Copy link
Collaborator

Choose a reason for hiding this comment

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

оставь как было

"""Aдминка для Division."""

ordering = ("-updated_at",)
list_display = ("title", "author", "created_at", "updated_at", "courses")
list_display = ("title", "author", "updated_at", "courses")
exclude = ("author",)
Copy link
Collaborator

Choose a reason for hiding this comment

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

автора нужно добавить в raw_field (посмотри по проект по "row")

list_display = ("id", "volunteer", "division", "level")
list_display_links = ("volunteer",)
list_filter = (
"volunteer",
Copy link
Collaborator

Choose a reason for hiding this comment

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

волонтера добавь в raw_field

@@ -113,3 +129,4 @@ class VolunteerAdmin(admin.ModelAdmin):
admin.site.register(Department)
admin.site.register(Badge, BadgeAdmin)
admin.site.register(Level, LevelAdmin)
admin.site.register(UserDivisionLevel, UserDivisionLevelAdmin)
Copy link
Collaborator

Choose a reason for hiding this comment

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

отдельно таблицу связей отображать не надо

в карточке пользователя добавь отображение списка направлений

"courses.Division",
through="users.UserDivisionLevel",
blank=True,
related_name="volunteers",
Copy link
Collaborator

Choose a reason for hiding this comment

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

здесь указывается имя для обратной связи,

related_name="+",

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants