Skip to content

Commit 4745fe2

Browse files
dependabot[bot]fsbraunpre-commit-ci[bot]
authored
chore(deps-dev): bump webpack and babel-loader (#247)
* chore(deps-dev): bump webpack and babel-loader Bumps [webpack](https://github.com/webpack/webpack) and [babel-loader](https://github.com/babel/babel-loader). These dependencies needed to be updated together. Updates `webpack` from 4.46.0 to 5.94.0 - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](webpack/webpack@v4.46.0...v5.94.0) Updates `babel-loader` from 7.1.5 to 9.1.3 - [Release notes](https://github.com/babel/babel-loader/releases) - [Changelog](https://github.com/babel/babel-loader/blob/main/CHANGELOG.md) - [Commits](babel/babel-loader@v7.1.5...v9.1.3) --- updated-dependencies: - dependency-name: webpack dependency-type: direct:development - dependency-name: babel-loader dependency-type: direct:development ... Signed-off-by: dependabot[bot] <[email protected]> * Remove webpack * ci: auto fixes from pre-commit hooks for more information, see https://pre-commit.ci * Update tests * Add Py 3.13 tests * Update github action * Update test.yml * Update test.yml --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Fabian Braun <[email protected]> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
1 parent 7821722 commit 4745fe2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+1546
-16619
lines changed

.github/workflows/test.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@ name: CodeCov
22

33
concurrency:
44
group: ${{ github.workflow }}-${{ github.ref }}
5-
cancel-in-progress: true
5+
cancel-in-progress: false
66

77
on:
88
pull_request:
9-
push:
109

1110
jobs:
1211
unit-tests:
@@ -88,8 +87,8 @@ jobs:
8887
matrix:
8988
python-version: ['3.13']
9089
requirements-file: [
91-
'py311-djmain-cms41-default.txt',
92-
'py311-djmain-cms41-versioning.txt',
90+
'py313-djmain-cms50-default.txt',
91+
'py313-djmain-cms50-versioning.txt',
9392
]
9493
os: [
9594
ubuntu-latest,

.nvmrc

Lines changed: 0 additions & 1 deletion
This file was deleted.

djangocms_alias/forms.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ class Media:
228228
js = (
229229
"admin/js/jquery.init.js",
230230
"cms/js/select2/select2.js",
231-
"djangocms_alias/js/dist/bundle.alias.create.min.js",
231+
"djangocms_alias/js/create.js",
232232
"djangocms_alias/js/alias_plugin.js",
233233
)
234234

djangocms_alias/static/djangocms_alias/js/dist/bundle.alias.create.min.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

djangocms_alias/views.py

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import json
22

33
from cms.models import Page
4-
from cms.toolbar.utils import get_plugin_toolbar_info, get_plugin_tree_as_json
4+
from cms.toolbar.utils import get_plugin_toolbar_info
55
from django.contrib import admin
66
from django.core.exceptions import PermissionDenied
77
from django.db.models import Q
@@ -29,6 +29,17 @@
2929
</div></div>
3030
"""
3131

32+
try:
33+
from cms.toolbar.utils import get_plugin_tree
34+
except ImportError:
35+
from cms.toolbar.utils import get_plugin_tree_as_json
36+
37+
def get_plugin_tree(request, plugins):
38+
"""
39+
Fallback for older versions of django CMS
40+
"""
41+
return json.loads(get_plugin_tree_as_json(request, plugins))
42+
3243

3344
def detach_alias_plugin_view(request, plugin_pk):
3445
if not request.user.is_staff:
@@ -156,15 +167,15 @@ def render_replace_response(request, new_plugins, source_placeholder=None, sourc
156167
plugin.language,
157168
parent_id=plugin.parent_id,
158169
)
159-
plugin_tree = get_plugin_tree_as_json(request, plugins)
170+
plugin_tree = get_plugin_tree(request, plugins)
160171
move_data = get_plugin_toolbar_info(plugin)
161172
move_data["plugin_order"] = plugin_order
162-
move_data.update(json.loads(plugin_tree))
173+
move_data.update(plugin_tree)
163174
move_plugins.append(json.dumps(move_data))
164175
add_plugins.append(
165176
(
166177
json.dumps(get_plugin_toolbar_info(plugin)),
167-
plugin_tree,
178+
json.dumps(plugin_tree),
168179
)
169180
)
170181
context = {

gulpfile.js

Lines changed: 0 additions & 42 deletions
This file was deleted.

0 commit comments

Comments
 (0)