Skip to content
This repository has been archived by the owner on Mar 24, 2023. It is now read-only.

fix boefje settings forms for integer fields #91

Merged
merged 5 commits into from
Dec 28, 2022
Merged

fix boefje settings forms for integer fields #91

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b1a3333
fix boefje settings forms for integer fields
noamblitz Dec 22, 2022
aae1175
cleaner required check
noamblitz Dec 22, 2022
8af3bcb
Merge branch 'main' into fix/boefje-settings-forms
underdarknl Dec 27, 2022
ea84d25
blacken
noamblitz Dec 28, 2022
1775bc4
Merge branch 'main' into fix/boefje-settings-forms
noamblitz Dec 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 22 additions & 17 deletions katalogus/forms/plugin_settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,20 @@ def populate_fields(self):
required = False
help_text = ""
for field_name, field_props in fields.items():
if field_name in required_fields:
required = True
field_type = FIELD_TYPES[field_props["type"]]
if "description" in field_props:
help_text = field_props["description"]
self.fields[field_name] = field_type(
required=required,
label=field_props.get("title", field_name),
max_length=min(MAX_SETTINGS_VALUE_LENGTH, field_props.get("maxLength", MAX_SETTINGS_VALUE_LENGTH)),
help_text=_(help_text),
error_messages=self.error_messages,
)
kwargs = {
"required": field_name in required_fields,
"label": field_props.get("title", field_name),
"help_text": _(help_text),
"error_messages": self.error_messages,
}
if field_props["type"] == "string":
kwargs["max_length"] = min(
MAX_SETTINGS_VALUE_LENGTH, field_props.get("maxLength", MAX_SETTINGS_VALUE_LENGTH)
)
self.fields[field_name] = field_type(**kwargs)


class PluginSettingAddEditForm(forms.Form):
Expand All @@ -62,11 +64,14 @@ def populate_field(self):
initial = self.setting_value
if field:
field_type = FIELD_TYPES[field["type"]]
self.fields[self.setting_name] = field_type(
required=self.setting_name in self.plugin_schema["required"],
label=field.get("title", field),
max_length=min(MAX_SETTINGS_VALUE_LENGTH, field.get("maxLength", MAX_SETTINGS_VALUE_LENGTH)),
help_text=_(help_text),
error_messages=self.error_messages,
initial=initial,
)
kwargs = {
"required": self.setting_name in self.plugin_schema["required"],
"label": field.get("title", field),
"help_text": _(help_text),
"error_messages": self.error_messages,
"initial": initial,
}
if field["type"] == "string":
kwargs["max_length"] = min(MAX_SETTINGS_VALUE_LENGTH, field.get("maxLength", MAX_SETTINGS_VALUE_LENGTH))

self.fields[self.setting_name] = field_type(**kwargs)