Skip to content

Commit

Permalink
Undo unnecessary change and update tests
Browse files Browse the repository at this point in the history
  • Loading branch information
fsbraun committed Oct 30, 2023
1 parent 9895dda commit 4eab4e5
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 8 deletions.
3 changes: 2 additions & 1 deletion djangocms_versioning/helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,8 @@ def get_editable_url(content_obj):
This method is provides the URL for it.
"""
if is_editable_model(content_obj.__class__):
url = get_object_edit_url(content_obj)
language = getattr(content_obj, "language", None)
url = get_object_edit_url(content_obj, language)
# Or else, the standard edit view should be used
else:
url = admin_reverse(
Expand Down
16 changes: 9 additions & 7 deletions tests/test_admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
from django.urls import reverse
from django.utils.http import urlencode
from django.utils.timezone import now
from django.utils.translation import override
from freezegun import freeze_time

import djangocms_versioning.helpers
Expand Down Expand Up @@ -426,13 +427,14 @@ def test_content_link_for_editable_object_with_no_preview_url(self):
"""
version = factories.PageVersionFactory(content__title="test5")
with patch.object(helpers, "is_editable_model", return_value=True):
self.assertEqual(
self.site._registry[Version].content_link(version),
'<a target="_top" class="js-close-sideframe" href="{url}">{label}</a>'.format(
url=get_object_preview_url(version.content, language=version.content.language),
label=version.content
),
)
with override(version.content.language):
self.assertEqual(
self.site._registry[Version].content_link(version),
'<a target="_top" class="js-close-sideframe" href="{url}">{label}</a>'.format(
url=get_object_preview_url(version.content, language=version.content.language),
label=version.content
),
)


class VersionAdminActionsTestCase(CMSTestCase):
Expand Down

0 comments on commit 4eab4e5

Please sign in to comment.