Skip to content

Commit 2f1e934

Browse files
committed
fix wrong media import for DjangoSelect2Widget
1 parent bb4261b commit 2f1e934

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

ephios/plugins/simpleresource/forms.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
from crispy_forms.helper import FormHelper
12
from django.forms import BaseModelFormSet, BooleanField, ModelForm, modelformset_factory
23
from django.forms.formsets import DELETION_FIELD_NAME
34
from django.utils.translation import gettext as _
@@ -17,6 +18,8 @@ class Meta:
1718

1819
def __init__(self, *args, shift, **kwargs):
1920
self.shift = shift
21+
self.helper = FormHelper()
22+
self.helper.include_media = False
2023
try:
2124
kwargs.setdefault("instance", ResourceAllocation.objects.get(shift=shift))
2225
except ResourceAllocation.DoesNotExist:
Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
11
from django.db import models
2+
from django.utils.translation import gettext_lazy as _
23

34
from ephios.core.models import Shift
45

56

67
class ResourceCategory(models.Model):
7-
name = models.CharField(max_length=50)
8+
name = models.CharField(max_length=50, verbose_name=_("Name"))
89

910
def __str__(self):
1011
# pylint: disable=invalid-str-returned
1112
return self.name
1213

1314

1415
class Resource(models.Model):
15-
title = models.CharField(max_length=100)
16-
category = models.ForeignKey(ResourceCategory, on_delete=models.CASCADE)
16+
title = models.CharField(max_length=100, verbose_name=_("Title"))
17+
category = models.ForeignKey(
18+
ResourceCategory, on_delete=models.CASCADE, verbose_name=_("Category")
19+
)
1720

1821
def __str__(self):
1922
# pylint: disable=invalid-str-returned
@@ -22,7 +25,7 @@ def __str__(self):
2225

2326
class ResourceAllocation(models.Model):
2427
shift = models.ForeignKey(Shift, on_delete=models.CASCADE)
25-
resources = models.ManyToManyField(Resource, blank=True)
28+
resources = models.ManyToManyField(Resource, blank=True, verbose_name=_("Resources"))
2629

2730
def __str__(self):
2831
return f"Resource allocation for {self.shift}"

0 commit comments

Comments
 (0)