8000 fix: Menus crashed when unexpected page content was present by fsbraun · Pull Request #8052 · django-cms/django-cms · GitHub
[go: up one dir, main page]
Skip to content

fix: Menus crashed when unexpected page content was present #8052

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 15 commits into from
Nov 4, 2024
Merged

fix: Menus crashed when unexpected page content was present #8052

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
fad014d
fix; Remove partial cache fill
Oct 30, 2024
e5152f8
Fix admin_cache
Oct 30, 2024
4af1033
Fix: Menu app crashed for fallback translations
Oct 30, 2024
234024d
Fix: Inconsistent page content models crashed menus
Oct 30, 2024
9de4edb
Update plugin position update
Oct 31, 2024
0a10879
Test different raw sql
Oct 31, 2024
5077acc
Replace chinese ) by )
Oct 31, 2024
5847c7b
Undo sql changes
Oct 31, 2024
a1c1c5a
Undo unwanted changes to placeholdermodel.py
fsbraun Oct 31, 2024
d189551
Update placeholdermodel.py
fsbraun Oct 31, 2024
01f8634
Update placeholdermodel.py
fsbraun Oct 31, 2024
3451cc5
Merge branch 'release/4.1.x' into chore/backport-8086
fsbraun Nov 4, 2024
25fa60a
Fix linting issues
Nov 4, 2024
2b381d8
Dj2.2 compatible template tags
Nov 4, 2024 8000
8352917
Align test environments
fsbraun Nov 4, 2024
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
Undo unwanted changes to placeholdermodel.py
  • Loading branch information
@fsbraun
fsbraun authored Oct 31, 2024
commit a1c1c5ab20a827a93810c02ff1cd9d31f9b2db46
7 changes: 2 additions & 5 deletions cms/models/placeholdermodel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -692,7 +692,7 @@ def delete_plugin(self, instance):
self._shift_plugin_positions(
instance.language,
start=instance.position,
offset=last_plugin.position + 1,
offset=last_plugin.position,
)
self._recalculate_plugin_positions(instance.language)

Expand Down Expand Up @@ -740,10 +740,7 @@ def get_last_plugin_position(self, language, parent=None):

def _shift_plugin_positions(self, language, start, offset=None):
if offset is None:
offset = self.get_last_plugin_position(language)
if offset is None:
return
offset += 1
offset = self.get_last_plugin_position(language) or 0
self.get_plugins(language).filter(
position__gte=start
).update(position=models.F('position') + offset)
Expand Down
Loading
0