Skip to content

Commit

Permalink
ci: auto fixes from pre-commit hooks
Browse files Browse the repository at this point in the history
for more information, see https://pre-commit.ci
  • Loading branch information
pre-commit-ci[bot] committed Mar 9, 2024
1 parent 106f421 commit 8d1a6bc
Show file tree
Hide file tree
Showing 29 changed files with 213 additions and 509 deletions.
13 changes: 3 additions & 10 deletions djangocms_alias/admin.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
from cms.utils.permissions import get_model_permission_codename
from cms.utils.urlutils import admin_reverse
from django.contrib import admin
from django.db.models.functions import Lower
from django.template.loader import render_to_string
from django.utils.translation import gettext_lazy as _

from cms.utils.permissions import get_model_permission_codename
from cms.utils.urlutils import admin_reverse

from parler.admin import TranslatableAdmin

from .cms_config import AliasCMSConfig
Expand All @@ -20,7 +18,6 @@
is_versioning_enabled,
)


__all__ = [
"AliasAdmin",
"CategoryAdmin",
Expand Down Expand Up @@ -139,11 +136,7 @@ class AliasContentAdmin(*alias_content_admin_classes):
def get_queryset(self, request):
queryset = super().get_queryset(request)
# Force the category set to Lower, to be able to sort the category in ascending/descending order
queryset = queryset.annotate(
alias_category_translations_ordered=Lower(
"alias__category__translations__name"
)
)
queryset = queryset.annotate(alias_category_translations_ordered=Lower("alias__category__translations__name"))
return queryset

# Add Alias category in the admin manager list and order field
Expand Down
17 changes: 4 additions & 13 deletions djangocms_alias/cms_config.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
from cms.app_base import CMSAppConfig
from django.apps import apps
from django.conf import settings

from cms.app_base import CMSAppConfig

from .models import AliasContent, AliasPlugin, copy_alias_content
from .rendering import render_alias_content


try:
apps.get_app_config("djangocms_internalsearch")
from .internal_search import AliasContentConfig
Expand All @@ -26,16 +24,11 @@ class AliasCMSConfig(CMSAppConfig):
cms_toolbar_enabled_models = [(AliasContent, render_alias_content)]
moderated_models = [AliasContent]

djangocms_moderation_enabled = getattr(
settings, "MODERATING_ALIAS_MODELS_ENABLED", True
)
djangocms_versioning_enabled = getattr(
settings, "VERSIONING_ALIAS_MODELS_ENABLED", True
)
djangocms_moderation_enabled = getattr(settings, "MODERATING_ALIAS_MODELS_ENABLED", True)
djangocms_versioning_enabled = getattr(settings, "VERSIONING_ALIAS_MODELS_ENABLED", True)

if djangocms_versioning_enabled and djangocms_versioning_installed:
from cms.utils.i18n import get_language_tuple

from djangocms_versioning.datastructures import VersionableItem

versioning = [
Expand All @@ -49,9 +42,7 @@ class AliasCMSConfig(CMSAppConfig):
),
]

djangocms_references_enabled = getattr(
settings, "REFERENCES_ALIAS_MODELS_ENABLED", True
)
djangocms_references_enabled = getattr(settings, "REFERENCES_ALIAS_MODELS_ENABLED", True)
reference_fields = [
(AliasPlugin, "alias"),
]
Expand Down
4 changes: 1 addition & 3 deletions djangocms_alias/cms_menus.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@ class AliasDisableMenu(Modifier):
"""Disable menu rendering on alias pages"""

def modify(self, request, nodes, namespace, root_id, post_cut, breadcrumb):
if request.toolbar.app_name == PLUGIN_URL_NAME_PREFIX or isinstance(
request.toolbar.obj, AliasContent
):
if request.toolbar.app_name == PLUGIN_URL_NAME_PREFIX or isinstance(request.toolbar.obj, AliasContent):
return []
return nodes

Expand Down
24 changes: 10 additions & 14 deletions djangocms_alias/cms_plugins.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
from copy import copy

from django.utils.translation import (
get_language_from_request,
gettext_lazy as _,
)

from cms.plugin_base import CMSPluginBase, PluginMenuItem
from cms.plugin_pool import plugin_pool
from cms.utils.permissions import (
Expand All @@ -13,11 +8,17 @@
)
from cms.utils.plugins import copy_plugins_to_placeholder
from cms.utils.urlutils import add_url_parameters, admin_reverse
from django.utils.translation import (
get_language_from_request,
)
from django.utils.translation import (
gettext_lazy as _,
)

from .constants import CREATE_ALIAS_URL_NAME, DETACH_ALIAS_PLUGIN_URL_NAME
from .forms import AliasPluginForm
from .models import Alias as AliasModel, AliasContent, AliasPlugin

from .models import Alias as AliasModel
from .models import AliasContent, AliasPlugin

__all__ = [
"Alias",
Expand All @@ -31,10 +32,7 @@ class Alias(CMSPluginBase):
form = AliasPluginForm

def get_render_template(self, context, instance, placeholder):
if (
isinstance(instance.placeholder.source, AliasContent)
and instance.is_recursive()
):
if isinstance(instance.placeholder.source, AliasContent) and instance.is_recursive():
return "djangocms_alias/alias_recursive.html"
return f"djangocms_alias/{instance.template}/alias.html"

Expand Down Expand Up @@ -114,9 +112,7 @@ def can_create_alias(cls, user, plugins=None, replace=False):
return True
elif replace:
target_placeholder = plugins[0].placeholder
if not target_placeholder.check_source(user) or not has_plugin_permission(
user, Alias.__name__, "add"
):
if not target_placeholder.check_source(user) or not has_plugin_permission(user, Alias.__name__, "add"):
return False

return all(
Expand Down
33 changes: 10 additions & 23 deletions djangocms_alias/cms_toolbars.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
import itertools
from copy import copy

from django.urls import NoReverseMatch
from django.utils.encoding import force_str
from django.utils.translation import gettext, gettext_lazy as _

from cms.cms_toolbars import (
ADMIN_MENU_IDENTIFIER,
ADMINISTRATION_BREAK,
Expand All @@ -21,6 +17,10 @@
)
from cms.utils.permissions import get_model_permission_codename
from cms.utils.urlutils import add_url_parameters, admin_reverse
from django.urls import NoReverseMatch
from django.utils.encoding import force_str
from django.utils.translation import gettext
from django.utils.translation import gettext_lazy as _

from .constants import (
DELETE_ALIAS_URL_NAME,
Expand All @@ -30,7 +30,6 @@
from .models import Alias, AliasContent
from .utils import is_versioning_enabled


__all__ = [
"AliasToolbar",
]
Expand Down Expand Up @@ -146,19 +145,15 @@ def get_insert_position(cls, admin_menu, item_name):
return end.index

def enable_create_wizard_button(self):
button_lists = [
result.item for result in self.toolbar.find_items(item_type=ButtonList)
]
button_lists = [result.item for result in self.toolbar.find_items(item_type=ButtonList)]
buttons = list(
# flatten the list
itertools.chain.from_iterable([item.buttons for item in button_lists])
)

# There will always be this button, because we are in the context of
# alias app views
create_wizard_button = [
button for button in buttons if button.name == gettext("Create")
][0]
create_wizard_button = [button for button in buttons if button.name == gettext("Create")][0]

from cms.wizards.wizard_pool import entry_choices

Expand Down Expand Up @@ -187,9 +182,7 @@ def override_language_switcher(self):
if alias_content:
with force_language(code):
url = alias_content.get_absolute_url()
language_menu.add_link_item(
name, url=url, active=self.current_lang == code
)
language_menu.add_link_item(name, url=url, active=self.current_lang == code)

def change_language_menu(self):
if self.toolbar.edit_mode_active and isinstance(self.toolbar.obj, AliasContent):
Expand All @@ -209,17 +202,13 @@ def change_language_menu(self):
current_placeholder = alias_content.placeholder

remove = [
(code, languages.get(code, code))
for code in alias_content.alias.get_languages()
if code in languages
(code, languages.get(code, code)) for code in alias_content.alias.get_languages() if code in languages
]
add = [code for code in languages.items() if code not in remove]
copy = [
(code, name)
for code, name in languages.items()
if code != self.current_lang
and (code, name) in remove
and current_placeholder
if code != self.current_lang and (code, name) in remove and current_placeholder
]

if add or remove or copy:
Expand All @@ -233,9 +222,7 @@ def change_language_menu(self):
add_url = admin_reverse("djangocms_alias_aliascontent_add")

for code, name in add:
url = add_url_parameters(
add_url, language=code, alias=alias_content.alias_id
)
url = add_url_parameters(add_url, language=code, alias=alias_content.alias_id)
add_plugins_menu.add_modal_item(name, url=url)

if remove:
Expand Down
6 changes: 3 additions & 3 deletions djangocms_alias/cms_wizards.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
from django.utils.translation import gettext_lazy as _

from cms.utils.permissions import get_model_permission_codename
from cms.wizards.wizard_base import Wizard
from cms.wizards.wizard_pool import wizard_pool
from django.utils.translation import gettext_lazy as _

from .cms_plugins import Alias
from .forms import CreateAliasWizardForm, CreateCategoryWizardForm
from .models import Alias as AliasModel, Category
from .models import Alias as AliasModel
from .models import Category


class CreateAliasWizard(Wizard):
Expand Down
1 change: 0 additions & 1 deletion djangocms_alias/compat.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,5 @@

from django import get_version


DJANGO_VERSION = get_version()
DJANGO_4_0 = LooseVersion(DJANGO_VERSION) < LooseVersion("4.1")
30 changes: 8 additions & 22 deletions djangocms_alias/filters.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
from cms.forms.utils import get_sites
from cms.utils.i18n import get_language_tuple, get_site_language_from_request
from django.contrib import admin
from django.utils.encoding import smart_str
from django.utils.translation import gettext_lazy as _

from cms.forms.utils import get_sites
from cms.utils.i18n import get_language_tuple, get_site_language_from_request

from .cms_config import AliasCMSConfig
from .constants import (
CATEGORY_FILTER_PARAM,
Expand All @@ -14,7 +13,6 @@
)
from .models import Category


djangocms_versioning_enabled = AliasCMSConfig.djangocms_versioning_enabled


Expand All @@ -40,9 +38,7 @@ def choices(self, changelist):
for lookup, title in self.lookup_choices:
yield {
"selected": self.value() == str(lookup),
"query_string": changelist.get_query_string(
{self.parameter_name: lookup}
),
"query_string": changelist.get_query_string({self.parameter_name: lookup}),
"display": title,
}

Expand Down Expand Up @@ -70,17 +66,13 @@ def choices(self, changelist):
}
yield {
"selected": self.value() == SITE_FILTER_NO_SITE_VALUE,
"query_string": changelist.get_query_string(
{self.parameter_name: SITE_FILTER_NO_SITE_VALUE}
),
"query_string": changelist.get_query_string({self.parameter_name: SITE_FILTER_NO_SITE_VALUE}),
"display": _("No site"),
}
for lookup, title in self.lookup_choices:
yield {
"selected": self.value() == str(lookup),
"query_string": changelist.get_query_string(
{self.parameter_name: lookup}
),
"query_string": changelist.get_query_string({self.parameter_name: lookup}),
"display": title,
}

Expand Down Expand Up @@ -110,9 +102,7 @@ def choices(self, changelist):
for lookup, title in self.lookup_choices:
yield {
"selected": self.value() == str(lookup),
"query_string": changelist.get_query_string(
{self.parameter_name: lookup}
),
"query_string": changelist.get_query_string({self.parameter_name: lookup}),
"display": title,
}

Expand All @@ -138,16 +128,12 @@ def queryset(self, request, queryset):
def choices(self, changelist):
yield {
"selected": self.value() is None,
"query_string": changelist.get_query_string(
remove=[self.parameter_name]
),
"query_string": changelist.get_query_string(remove=[self.parameter_name]),
"display": _("Hide"),
}
for lookup, title in self.lookup_choices:
yield {
"selected": self.value() == str(lookup),
"query_string": changelist.get_query_string(
{self.parameter_name: lookup}
),
"query_string": changelist.get_query_string({self.parameter_name: lookup}),
"display": title,
}
Loading

0 comments on commit 8d1a6bc

Please sign in to comment.