Skip to content
Snippets Groups Projects
Verified Commit c23f1224 authored by Nik | Klampfradler's avatar Nik | Klampfradler Committed by Jonathan Weth
Browse files

Replace constance in sass helpers and models

parent bfe78906
No related branches found
No related tags found
1 merge request!217Migrate from constance to dynamic-preferences
......@@ -20,7 +20,9 @@ from .tasks import send_notification
from .util.core_helpers import now_tomorrow
from .util.model_helpers import ICONS
from constance import config
from dynamic_preferences.registries import global_preferences_registry
global_preferences = global_preferences_registry.manager()
class School(ExtensibleModel):
......@@ -176,9 +178,9 @@ class Person(ExtensibleModel):
@property
def adressing_name(self) -> str:
if config.ADRESSING_NAME_FORMAT == "dutch":
if global_preferences["notification__addressing_name_format"] == "dutch":
return f"{self.last_name} {self.first_name}"
elif config.ADRESSING_NAME_FORMAT == "english":
elif global_preferences["notification__addressing_name_format"] == "english":
return f"{self.last_name}, {self.first_name}"
else:
return f"{self.first_name} {self.last_name}"
......@@ -239,7 +241,7 @@ class Person(ExtensibleModel):
a primary group, unless force is True.
"""
pattern = pattern or config.PRIMARY_GROUP_PATTERN
pattern = pattern or global_preferences["account__primary_group_pattern"]
if pattern:
if force or not self.primary_group:
......
......@@ -318,7 +318,7 @@ SASS_PROCESSOR_ENABLED = True
SASS_PROCESSOR_AUTO_INCLUDE = False
SASS_PROCESSOR_CUSTOM_FUNCTIONS = {
"get-colour": "aleksis.core.util.sass_helpers.get_colour",
"get-config": "aleksis.core.util.sass_helpers.get_config",
"get-preference": "aleksis.core.util.sass_helpers.get_preference",
}
SASS_PROCESSOR_INCLUDE_DIRS = [
_settings.get("materialize.sass_path", JS_ROOT + "/materialize-css/sass/"),
......
from django.conf import settings
from colour import web2hex
from constance import config
from dynamic_preferences.registries import global_preferences_registry
from sass import SassColor
......@@ -12,5 +12,6 @@ def get_colour(html_colour: str) -> SassColor:
return SassColor(r, g, b, 255)
def get_config(setting: str) -> str:
return getattr(config, setting, "") or getattr(settings, setting, "")
def get_preference(section: str, name: str) -> str:
global_preferences = global_preferences_registry.manager()
return global_preferences["%s__%s" % (section, name)]
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