Skip to content
Snippets Groups Projects
Commit d6c1818e authored by Tom Teichler's avatar Tom Teichler :beers:
Browse files

[Review] Reformat code

parent 9126d304
No related branches found
No related tags found
No related merge requests found
Showing
with 84 additions and 54 deletions
import pkg_resources
from django.utils.translation import gettext_lazy as _
import pkg_resources
try:
from .celery import app as celery_app
except ModuleNotFoundError:
......
......@@ -4,16 +4,15 @@ from reversion.admin import VersionAdmin
from .mixins import BaseModelAdmin
from .models import (
Group,
Person,
Activity,
Notification,
Announcement,
AnnouncementRecipient,
CustomMenuItem,
Group,
Notification,
Person,
)
admin.site.register(Person, VersionAdmin)
admin.site.register(Group, VersionAdmin)
admin.site.register(Activity, VersionAdmin)
......
......@@ -7,7 +7,11 @@ from django.utils.translation import gettext_lazy as _
from dynamic_preferences.registries import preference_models
from .registries import group_preferences_registry, person_preferences_registry, site_preferences_registry
from .registries import (
group_preferences_registry,
person_preferences_registry,
site_preferences_registry,
)
from .util.apps import AppConfig
from .util.core_helpers import has_person
from .util.sass_helpers import clean_scss
......@@ -34,9 +38,9 @@ class CoreConfig(AppConfig):
def ready(self):
super().ready()
SitePreferenceModel = self.get_model('SitePreferenceModel')
PersonPreferenceModel = self.get_model('PersonPreferenceModel')
GroupPreferenceModel = self.get_model('GroupPreferenceModel')
SitePreferenceModel = self.get_model("SitePreferenceModel")
PersonPreferenceModel = self.get_model("PersonPreferenceModel")
GroupPreferenceModel = self.get_model("GroupPreferenceModel")
preference_models.register(SitePreferenceModel, site_preferences_registry)
preference_models.register(PersonPreferenceModel, person_preferences_registry)
......@@ -52,16 +56,15 @@ class CoreConfig(AppConfig):
**kwargs,
) -> None:
if section == "theme":
if name in ("primary", "secondary"):
if name in ("primary", "secondary"):
clean_scss()
elif name in ("favicon", "pwa_icon"):
from favicon.models import Favicon # noqa
Favicon.on_site.update_or_create(title=name,
defaults={
"isFavicon": name == "favicon",
"faviconImage": new_value,
})
Favicon.on_site.update_or_create(
title=name,
defaults={"isFavicon": name == "favicon", "faviconImage": new_value,},
)
def post_migrate(
self,
......
import os
from celery import Celery
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "aleksis.core.settings")
app = Celery("aleksis") # noqa
app.config_from_object('django.conf:settings', namespace='CELERY')
app.config_from_object("django.conf:settings", namespace="CELERY")
app.autodiscover_tasks()
from django_filters import FilterSet, CharFilter
from django_filters import CharFilter, FilterSet
from material import Layout, Row
......
from datetime import time, datetime
from datetime import datetime, time
from typing import Optional
from django import forms
......@@ -10,11 +10,15 @@ from django.utils.translation import gettext_lazy as _
from django_select2.forms import ModelSelect2MultipleWidget, Select2Widget
from dynamic_preferences.forms import PreferenceForm
from material import Layout, Fieldset, Row
from material import Fieldset, Layout, Row
from .mixins import ExtensibleForm
from .models import Group, Person, Announcement, AnnouncementRecipient
from .registries import site_preferences_registry, person_preferences_registry, group_preferences_registry
from .models import Announcement, AnnouncementRecipient, Group, Person
from .registries import (
group_preferences_registry,
person_preferences_registry,
site_preferences_registry,
)
class PersonAccountForm(forms.ModelForm):
......
......@@ -41,9 +41,7 @@ MENUS = {
"name": _("2FA"),
"url": "two_factor:profile",
"icon": "phonelink_lock",
"validators": [
"menu_generator.validators.is_authenticated",
],
"validators": ["menu_generator.validators.is_authenticated",],
},
{
"name": _("Me"),
......@@ -78,7 +76,10 @@ MENUS = {
"url": "announcements",
"icon": "announcement",
"validators": [
("aleksis.core.util.predicates.permission_validator", "core.view_announcements"),
(
"aleksis.core.util.predicates.permission_validator",
"core.view_announcements",
),
],
},
{
......@@ -94,7 +95,10 @@ MENUS = {
"url": "system_status",
"icon": "power_settings_new",
"validators": [
("aleksis.core.util.predicates.permission_validator", "core.view_system_status"),
(
"aleksis.core.util.predicates.permission_validator",
"core.view_system_status",
),
],
},
{
......@@ -110,16 +114,17 @@ MENUS = {
"url": "preferences_site",
"icon": "settings",
"validators": [
("aleksis.core.util.predicates.permission_validator", "core.change_site_preferences"),
(
"aleksis.core.util.predicates.permission_validator",
"core.change_site_preferences",
),
],
},
{
"name": _("Backend Admin"),
"url": "admin:index",
"icon": "settings",
"validators": [
"menu_generator.validators.is_superuser",
],
"validators": ["menu_generator.validators.is_superuser",],
},
],
},
......@@ -128,7 +133,9 @@ MENUS = {
"url": "#",
"icon": "people",
"root": True,
"validators": [("aleksis.core.util.predicates.permission_validator", "core.view_people_menu")],
"validators": [
("aleksis.core.util.predicates.permission_validator", "core.view_people_menu")
],
"submenu": [
{
"name": _("Persons"),
......@@ -151,7 +158,10 @@ MENUS = {
"url": "persons_accounts",
"icon": "person_add",
"validators": [
("aleksis.core.util.predicates.permission_validator", "core.link_persons_accounts")
(
"aleksis.core.util.predicates.permission_validator",
"core.link_persons_accounts",
)
],
},
{
......@@ -159,7 +169,10 @@ MENUS = {
"url": "groups_child_groups",
"icon": "group_add",
"validators": [
("aleksis.core.util.predicates.permission_validator", "core.assign_child_groups_to_groups")
(
"aleksis.core.util.predicates.permission_validator",
"core.assign_child_groups_to_groups",
)
],
},
],
......@@ -170,7 +183,10 @@ MENUS = {
"name": _("Assign child groups to groups"),
"url": "groups_child_groups",
"validators": [
("aleksis.core.util.predicates.permission_validator", "core.assign_child_groups_to_groups")
(
"aleksis.core.util.predicates.permission_validator",
"core.assign_child_groups_to_groups",
)
],
},
],
......
# Generated by Django 3.0.2 on 2020-01-03 19:18
import aleksis.core.mixins
from django.conf import settings
import django.contrib.postgres.fields.jsonb
from django.db import migrations, models
import django.db.models.deletion
from django.conf import settings
from django.db import migrations, models
import image_cropping.fields
import phonenumber_field.modelfields
import aleksis.core.mixins
class Migration(migrations.Migration):
initial = True
......
# Generated by Django 3.0.2 on 2020-01-03 19:19
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
import django.utils.timezone
from django.conf import settings
from django.db import migrations, models
class Migration(migrations.Migration):
......
# Generated by Django 3.0.2 on 2020-01-05 16:50
from django.db import migrations, models
import django.utils.timezone
from django.db import migrations, models
class Migration(migrations.Migration):
......
# Generated by Django 3.0.2 on 2020-01-05 18:32
from django.db import migrations, models
import django.db.models.deletion
from django.db import migrations, models
class Migration(migrations.Migration):
......
# Generated by Django 3.0.2 on 2020-01-29 16:45
from django.db import migrations, models
import django.db.models.deletion
from django.db import migrations, models
class Migration(migrations.Migration):
......
# Generated by Django 3.0.2 on 2020-02-03 22:41
from django.db import migrations, models
import django.db.models.deletion
from django.db import migrations, models
class Migration(migrations.Migration):
......
# Generated by Django 3.0.3 on 2020-02-10 14:22
import datetime
from django.db import migrations, models
import django.db.models.deletion
from django.db import migrations, models
class Migration(migrations.Migration):
......
# Generated by Django 3.0.3 on 2020-02-20 12:24
import aleksis.core.util.core_helpers
import django.contrib.postgres.fields.jsonb
from django.db import migrations, models
import aleksis.core.util.core_helpers
class Migration(migrations.Migration):
......
# Generated by Django 3.0.3 on 2020-03-11 18:43
import aleksis.core.models
import django.contrib.postgres.fields.jsonb
from django.db import migrations, models
import django.db.models.deletion
from django.db import migrations, models
import aleksis.core.models
class Migration(migrations.Migration):
......
# Generated by Django 3.0.4 on 2020-03-21 16:39
import django.contrib.postgres.fields.jsonb
from django.db import migrations, models
import django.db.models.deletion
from django.db import migrations, models
class Migration(migrations.Migration):
......
# Generated by Django 3.0.5 on 2020-04-13 13:44
import django.contrib.postgres.fields.jsonb
from django.db import migrations, models
import django.db.models.deletion
from django.db import migrations, models
class Migration(migrations.Migration):
......
# Generated by Django 3.0.5 on 2020-04-30 19:41
from django.db import migrations, models
import django.db.models.deletion
from django.db import migrations, models
class Migration(migrations.Migration):
......
......@@ -6,13 +6,13 @@ from django.contrib.sites.managers import CurrentSiteManager
from django.contrib.sites.models import Site
from django.db import models
from django.db.models import QuerySet
from django.forms.models import ModelFormMetaclass, ModelForm
from django.forms.models import ModelForm, ModelFormMetaclass
import reversion
from easyaudit.models import CRUDEvent
from guardian.admin import GuardedModelAdmin
from jsonstore.fields import JSONField, JSONFieldMixin
from material.base import LayoutNode, Layout
import reversion
from material.base import Layout, LayoutNode
from rules.contrib.admin import ObjectPermissionsModelAdmin
......@@ -187,8 +187,10 @@ class ExtensibleModel(CRUDMixin):
class Meta:
abstract = True
class PureDjangoModel(object):
""" No-op mixin to mark a model as deliberately not using ExtensibleModel """
pass
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment