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

Custom admin site for reordering app list #2421

Merged
merged 7 commits into from
Oct 3, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/apps/orders/tests/orders/services/tests_order_refunder.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@
]


@pytest.fixture(autouse=True)
Copy link
Contributor

Choose a reason for hiding this comment

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

Мне хотелось бы видеть это в отдельном ПР, если у тебя есть время на это. Здесь мы работаем над списком приложений в админке

def _set_locale(settings):
settings.LANGUAGE_CODE = "en"


@pytest.fixture(autouse=True)
def _adjust_settings(settings):
settings.BANKS_REFUNDS_ENABLED = True
Expand Down
14 changes: 11 additions & 3 deletions src/core/admin/admin_site.py
Original file line number Diff line number Diff line change
@@ -1,18 +1,26 @@
from typing import Any

from django.contrib import admin
from django.http.request import HttpRequest


class AdminSite(admin.AdminSite):
def __init__(self, name: str) -> None:
super().__init__(name=name)
self._registry.update(admin.site._registry)

def get_app_list(self, request: Any, app_label: Any | None = None) -> list[Any]:
def get_app_list(self, request: HttpRequest, app_label: str | None = None) -> list[str]:
app_list = super().get_app_list(request, app_label)
app_order = ["orders", "notion", "chains", "products", "otherapp"]
app_list.sort(key=lambda x: app_order.index(x["app_label"]) if x["app_label"] in app_order else len(app_order))
app_list.sort(key=self._get_app_order_index)
return app_list

def _get_app_order_index(self, element: Any) -> int:
Copy link
Contributor

Choose a reason for hiding this comment

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

Этот метод не использует состояние класс, поэтому его лучше оформить как @staticmethod, чтобы в будущем, когда мы забудем что он делает, было бы легче это восстановить.

Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
def _get_app_order_index(self, element: Any) -> int:
def _get_app_order_index(self, element: dict) -> int:

Тут же вроде dict, не?

app_order = ["orders", "notion", "chains", "products", "otherapp"]

if element["app_label"] in app_order:
return app_order.index(element["app_label"])

return len(app_order)


admin_site = AdminSite(name="custom_admin")
Loading