Skip to content

Commit ec3e5b9

Browse files
authored
fix: Avoid unnecessary loading of actions.js asset into the toolbar (#403)
* fix: as of django-cms 4.1.1, the `actions.js` asset needs not be loaded for the toolbar * Fix test
1 parent 4c80aa5 commit ec3e5b9

File tree

4 files changed

+8
-12
lines changed

4 files changed

+8
-12
lines changed

djangocms_versioning/cms_toolbars.py

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,6 @@
3535

3636

3737
class VersioningToolbar(PlaceholderToolbar):
38-
class Media:
39-
js = ("cms/js/admin/actions.js",)
40-
4138
def _get_versionable(self):
4239
"""Helper method to get the versionable for the content type
4340
of the version
@@ -79,7 +76,7 @@ def _add_publish_button(self):
7976
_("Publish"),
8077
url=publish_url,
8178
disabled=False,
82-
extra_classes=["cms-btn-action", "js-action", "cms-form-post-method", "cms-versioning-js-publish-btn"],
79+
extra_classes=["cms-btn-action", "cms-form-post-method", "cms-versioning-js-publish-btn"],
8380
)
8481
self.toolbar.add_item(item)
8582

@@ -115,7 +112,7 @@ def _add_edit_button(self, disabled=False):
115112
_("Edit") if draft_exists else _("New Draft"),
116113
url=edit_url,
117114
disabled=disabled,
118-
extra_classes=["cms-btn-action", "js-action", "cms-form-post-method", "cms-versioning-js-edit-btn"],
115+
extra_classes=["cms-btn-action", "cms-form-post-method", "cms-versioning-js-edit-btn"],
119116
)
120117
self.toolbar.add_item(item)
121118

@@ -135,7 +132,6 @@ def _add_unlock_button(self):
135132
if can_unlock:
136133
extra_classes = [
137134
"cms-btn-action",
138-
"js-action",
139135
"cms-form-post-method",
140136
"cms-versioning-js-unlock-btn",
141137
]
@@ -316,7 +312,7 @@ def override_language_menu(self):
316312
# Only override the menu if it exists and a page can be found
317313
language_menu = self.toolbar.get_menu(LANGUAGE_MENU_IDENTIFIER, _("Language"))
318314
if settings.USE_I18N and language_menu and self.page:
319-
# remove_item uses `items` attribute so we have to copy object
315+
# remove_item uses `items` attribute, so we have to copy object
320316
for _item in copy(language_menu.items):
321317
language_menu.remove_item(item=_item)
322318

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import djangocms_versioning
44

55
INSTALL_REQUIREMENTS = [
6-
"Django>=1.11",
7-
"django-cms",
6+
"Django>=3.2",
7+
"django-cms>=4.1.1",
88
"django-fsm"
99
]
1010

tests/test_locking.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -839,7 +839,7 @@ def test_enable_edit_button_when_content_is_locked(self):
839839
self.assertFalse(edit_button.disabled)
840840
self.assertListEqual(
841841
edit_button.extra_classes,
842-
["cms-btn-action", "js-action", "cms-form-post-method", "cms-versioning-js-edit-btn"]
842+
["cms-btn-action", "cms-form-post-method", "cms-versioning-js-edit-btn"]
843843
)
844844

845845
def test_lock_message_when_content_is_locked(self):

tests/test_toolbars.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ def test_publish_in_toolbar_in_edit_mode(self):
6565
self.assertFalse(publish_button.disabled)
6666
self.assertListEqual(
6767
publish_button.extra_classes,
68-
["cms-btn-action", "js-action", "cms-form-post-method", "cms-versioning-js-publish-btn"],
68+
["cms-btn-action", "cms-form-post-method", "cms-versioning-js-publish-btn"],
6969
)
7070

7171
def test_revert_in_toolbar_in_preview_mode(self):
@@ -150,7 +150,7 @@ def test_edit_in_toolbar_in_preview_mode(self):
150150
self.assertFalse(edit_button.disabled)
151151
self.assertListEqual(
152152
edit_button.extra_classes,
153-
["cms-btn-action", "js-action", "cms-form-post-method", "cms-versioning-js-edit-btn"]
153+
["cms-btn-action", "cms-form-post-method", "cms-versioning-js-edit-btn"]
154154
)
155155

156156
def test_edit_not_in_toolbar_in_edit_mode(self):

0 commit comments

Comments
 (0)