8000 fix: Page Content Extension toolbar by fsbraun · Pull Request #7708 · django-cms/django-cms · GitHub
[go: up one dir, main page]
Skip to content

fix: Page Content Extension toolbar #7708

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.

Sign up for GitHub

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

Merged
merged 13 commits into from
Nov 30, 2023
Merged

fix: Page Content Extension toolbar #7708

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
bb9eab2
Fix: page content extension toolbar naming and use latest_content filter
fsbraun Nov 29, 2023
c58fa73
Align page content extension menu with shown page content
fsbraun Nov 29, 2023
1304ae9
Deprecate the use for more than one page content object
fsbraun Nov 29, 2023
79f7ff2
fix linting issue
fsbraun Nov 29, 2023
fb31b04
Accommodate review feedback
fsbraun Nov 29, 2023
548501a
Merge branch 'develop-4' into fix/extension-toolbar
fsbraun Nov 29, 2023
8cb4905
Add some comments
fsbraun Nov 29, 2023
4fe4806
Merge branch 'fix/extension-toolbar' of github.com:fsbraun/django-cms…
fsbraun Nov 29, 2023
7125cbe
Readability improvement `ruff format`
fsbraun Nov 29, 2023
1203d6e
One more readability improvement
fsbraun Nov 29, 2023
ed1e036
Doc-string update
fsbraun Nov 29, 2023
a684614
Fix typo
fsbraun Nov 29, 2023
3e23622
Merge branch 'develop-4' into fix/extension-toolbar
fsbraun Nov 30, 2023
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
Prev Previous commit
Next Next commit
One more readability improvement
  • Loading branch information
@fsbraun
fsbraun committed Nov 29, 2023
commit 1203d6e409d8cc3fe3a1827eec43afcab62af5ad
8 changes: 3 additions & 5 deletions cms/extensions/toolbar.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,12 @@ def get_page_extension_admin(self):
except self.model.DoesNotExist:
page_extension = None
try:
model_name = self.model.__name__.lower()
app_label, model_name = self.model._meta.app_label, self.model.__name__.lower()
if page_extension:
admin_url = admin_reverse(
f"{self.model._meta.app_label}_{model_name}_change", args=(page_extension.pk,)
)
admin_url = admin_reverse(f"{app_label}_{model_name}_change", args=(page_extension.pk,))
else:
admin_url = "{}?extended_object={}".format(
admin_reverse(f"{self.model._meta.app_label}_{model_name}_add"), self.page.pk
admin_reverse(f"{app_label}_{model_name}_add"), self.page.pk
)
except NoReverseMatch: # pragma: no cover
admin_url = None
Expand Down
0