8000 fix: `.load` jQuery method erroneously replaced by `.on('load')` by fsbraun · Pull Request #7679 · django-cms/django-cms · GitHub
[go: up one dir, main page]
Skip to content

fix: .load jQuery method erroneously replaced by .on('load') #7679

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 7 commits into from
Oct 24, 2023
Merged

fix: .load jQuery method erroneously replaced by .on('load') #7679

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1b67bda
Fix: `.load` jQuery method erroneously replaced by `on('load')`
fsbraun Oct 18, 2023
844e6dd
fix: Remove `can_publish` permission from django CMS 4 core (#7635)
fsbraun Oct 16, 2023
ed21f1a
Merge branch 'develop-4' into fix/issue-7677
fsbraun Oct 19, 2023
edff4b2
Fix: Use svg icons for boolean values in admin (present since Dango 1…
fsbraun Oct 23, 2023
ea7c2c8
Merge branch 'fix/issue-7677' of github.com:fsbraun/django-cms into f…
fsbraun Oct 23, 2023
231081e
Fix: Update to use .format for icon base
fsbraun Oct 23, 2023
04353ef
Fix: missing alt attribute
fsbraun Oct 23, 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
Fix: missing alt attribute
  • Loading branch information
@fsbraun
fsbraun committed Oct 23, 2023
commit 04353efc7ff41100f11aee13a1f0d9a4df84610f
2 changes: 1 addition & 1 deletion cms/models/managers.py
View file
Open in desktop
8000
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ def user_has_permissions(self, user, site_id, perms):
return queryset.filter(functools.reduce(operator.or_, queries)).exists()

def subordinate_to_user(self, user, site):
"""
r"""
Get all page permission objects on which user/group is lover in
hierarchy then given user and given user can change permissions on them.

Expand Down
6 changes: 3 additions & 3 deletions cms/templatetags/cms_admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,11 +217,11 @@ def choices():

@register.filter
def boolean_icon(value):
BOOLEAN_MAPPING = {True: 'yes', False: 'no', None: 'unknown'}
mapped_icon = {True: 'yes', False: 'no'}.get(value, 'unknown')
return format_html(
'<img src="{0}icon-{1}.svg" alt="{2}" />',
'<img src="{0}icon-{1}.svg" alt="{1}" />',
CMS_ADMIN_ICON_BASE,
BOOLEAN_MAPPING.get(value, 'unknown'),
mapped_icon,
)

@register.tag(name="page_submit_row")
Expand Down
0