diff --git a/stock/forms.py b/stock/forms.py
index 8e4a3b01..08a03e67 100644
--- a/stock/forms.py
+++ b/stock/forms.py
@@ -16,6 +16,8 @@ if TYPE_CHECKING:
class StockForm(forms.ModelForm):
+ required_css_class = "required"
+
class Meta:
model = models.Stock
fields = ["name", "club"]
@@ -34,6 +36,8 @@ class StockForm(forms.ModelForm):
class StockItemStockForm(forms.ModelForm):
+ required_css_class = "required"
+
name = forms.CharField(max_length=64, label=_("name"))
description = forms.CharField(
required=False, label=_("description"), widget=forms.Textarea
@@ -107,6 +111,8 @@ HIDDEN_QUANTITY_ACTIONS = (
class StockActionForm(forms.ModelForm):
+ required_css_class = "required"
+
class Meta:
model = models.StockAction
fields = ["comment", "action"]
@@ -127,7 +133,7 @@ class StockActionForm(forms.ModelForm):
StockItemActionFormSet = forms.inlineformset_factory(
models.StockAction,
models.StockItemAction,
- fields=["quantity_after", "item"],
+ fields=["item", "quantity_after"],
can_delete_extra=False,
can_delete=False,
min_num=1,
@@ -147,6 +153,8 @@ StockItemActionFormSet = forms.inlineformset_factory(
class RefuelMetadataForm(forms.ModelForm):
+ required_css_class = "required"
+
added_quantity = forms.DecimalField(
required=True,
min_value=0,
@@ -171,6 +179,8 @@ class RefuelMetadataForm(forms.ModelForm):
class TransferMetadataForm(forms.ModelForm):
+ required_css_class = "required"
+
transfer_quantity = forms.DecimalField(
required=True,
min_value=0,
diff --git a/stock/heper.py b/stock/heper.py
index 97037725..035d4183 100644
--- a/stock/heper.py
+++ b/stock/heper.py
@@ -9,7 +9,7 @@ if TYPE_CHECKING:
def can_be_edited_by(user: User, club: Club):
- return user.groups.contains(club.stock_group) or user.is_root
+ return user.is_in_group(pk=club.stock_group) or user.is_root
def can_be_view_by(user: User, club: Club, stock: Stock):
diff --git a/stock/templates/stock/action_form.jinja b/stock/templates/stock/action_form.jinja
index a196e401..7cf186c6 100644
--- a/stock/templates/stock/action_form.jinja
+++ b/stock/templates/stock/action_form.jinja
@@ -20,26 +20,35 @@
{% endmacro %}
-{% macro action_row(f) %}
-
- {% for h in f.hidden_fields() %}{{ h }}{% endfor %}
- {{ f.non_field_errors() }}
- {% for field in f.visible_fields() %}
- {{ field_row(field) }}
- {% endfor %}
+{% macro action_row(f, removable=true) %}
+
+
+ {% for h in f.hidden_fields() %}{{ h }}{% endfor %}
+ {{ f.non_field_errors() }}
+ {% for field in f.visible_fields() %}
+ {{ field_row(field) }}
+ {% endfor %}
- {% for b in f.blocks %}
-
- {% endfor %}
+ {% for b in f.blocks %}
+
+ {% endfor %}
+ {% if removable %}
+
+ {% endif %}
+