diff --git a/aleksis/apps/untis/forms.py b/aleksis/apps/untis/forms.py index 6809da79406f43ba3b9bbb9dbc1bc23dc07e2e8e..28cff78cacb677cce0106671a62d1ac9e6a97df0 100644 --- a/aleksis/apps/untis/forms.py +++ b/aleksis/apps/untis/forms.py @@ -5,7 +5,6 @@ from material import Fieldset from aleksis.core.forms import EditGroupForm from aleksis.core.models import Group -from aleksis.core.util.core_helpers import get_site_preferences class UntisUploadForm(forms.Form): @@ -31,5 +30,4 @@ class GroupSubjectForm(forms.ModelForm): GroupSubjectFormset = forms.modelformset_factory(Group, form=GroupSubjectForm, max_num=0, extra=0) -if get_site_preferences()["untis_mysql__use_course_groups"]: - EditGroupForm.add_node_to_layout(Fieldset(_("UNTIS import"), "untis_subject")) +EditGroupForm.add_node_to_layout(Fieldset(_("UNTIS import"), "untis_subject")) diff --git a/aleksis/apps/untis/model_extensions.py b/aleksis/apps/untis/model_extensions.py index 2f33cda213c61bc8c43f56eeaa4310d6afc3a473..344910e131d3827ebbff9de01bd95c81f549ab12 100644 --- a/aleksis/apps/untis/model_extensions.py +++ b/aleksis/apps/untis/model_extensions.py @@ -4,7 +4,6 @@ from jsonstore import CharField, IntegerField from aleksis.apps.chronos import models as chronos_models from aleksis.core import models as core_models -from aleksis.core.util.core_helpers import get_site_preferences core_models.Person.field( import_ref_untis=IntegerField(verbose_name=_("UNTIS import reference"), null=True, blank=True) @@ -12,18 +11,18 @@ core_models.Person.field( core_models.Group.field( import_ref_untis=IntegerField(verbose_name=_("UNTIS import reference"), null=True, blank=True) ) -if get_site_preferences()["untis_mysql__use_course_groups"]: - core_models.Group.field( - untis_subject=CharField( - verbose_name=_("UNTIS subject"), - help_text=_( - "The UNTIS import will use this for matching course groups" - "(along with parent groups)." + +core_models.Group.field( + untis_subject=CharField( + verbose_name=_("UNTIS subject"), + help_text=_( + "The UNTIS import will use this for matching course groups" + "(along with parent groups)." ), - blank=True, - max_length=255, - ) + blank=True, + max_length=255, ) +) # Chronos models chronos_models.Subject.field(