diff --git a/aleksis/core/frontend/components/app/LanguageForm.vue b/aleksis/core/frontend/components/app/LanguageForm.vue index 68321e7b1cfea7faf6530f4001c12c0dd8a768ee..12acbe613e94a23e25f5d1195b0badf420d92aa6 100644 --- a/aleksis/core/frontend/components/app/LanguageForm.vue +++ b/aleksis/core/frontend/components/app/LanguageForm.vue @@ -40,7 +40,7 @@ export default { this.$i18n.locale = languageOption.code; this.$vuetify.lang.current = languageOption.code; }, - nameForMenu: function(item) { + nameForMenu: function (item) { return `${item.nameLocal} (${item.code})`; }, }, diff --git a/aleksis/core/frontend/mixins/menus.js b/aleksis/core/frontend/mixins/menus.js index 375bd04994d46d0d53139150d361ae0487858c77..ee07678848c93436fc15f4f015b056f7a7728aa1 100644 --- a/aleksis/core/frontend/mixins/menus.js +++ b/aleksis/core/frontend/mixins/menus.js @@ -52,8 +52,7 @@ const menusMixin = { ? this.checkPermission(route.meta.menuPermission) : route.meta.permission ? this.checkPermission(route.meta.permission) - : true - ) && + : true) && (route.meta.validators ? this.checkValidators(route.meta.validators) : true) @@ -81,8 +80,7 @@ const menusMixin = { ? this.checkPermission(route.meta.menuPermission) : route.meta.permission ? this.checkPermission(route.meta.permission) - : true - ) && + : true) && (route.meta.validators ? this.checkValidators(route.meta.validators) : true) diff --git a/aleksis/core/schema/__init__.py b/aleksis/core/schema/__init__.py index 6b442beab63e67ee8f09006f6b325a0917d3cdab..c0c53f0add9d6690c866e2e178a106ed0faff0e9 100644 --- a/aleksis/core/schema/__init__.py +++ b/aleksis/core/schema/__init__.py @@ -126,7 +126,9 @@ class Query(graphene.ObjectType): allowed_object_ids = get_allowed_object_ids(info.context.user, indexed_models) if allowed_object_ids: - results = SearchQuerySet().filter(id__in=allowed_object_ids).filter(text=AutoQuery(query)) + results = ( + SearchQuerySet().filter(id__in=allowed_object_ids).filter(text=AutoQuery(query)) + ) if limit < 0: return results return results[:limit] diff --git a/aleksis/core/urls.py b/aleksis/core/urls.py index 5f4fff856c660e6168a611ed2bb06e98405a32e6..d43c3a920447a7db11f599e53c8795cf36ce4859 100644 --- a/aleksis/core/urls.py +++ b/aleksis/core/urls.py @@ -196,7 +196,6 @@ urlpatterns = [ views.CustomAuthorizationView.as_view(), name="oauth2_provider:authorize", ), - path("__i18n__/", include("django.conf.urls.i18n")), path( "ckeditor/upload/",