From db0c6a2ff0cee761dd37b2b581992e8d941146d9 Mon Sep 17 00:00:00 2001 From: Gregoo Date: Thu, 30 Jan 2025 16:38:11 +0100 Subject: [PATCH] Move from_form function about name to the base metadata class --- bricktracker/metadata.py | 11 +++++++++++ bricktracker/set_status.py | 8 ++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/bricktracker/metadata.py b/bricktracker/metadata.py index ac13c64..c7a9678 100644 --- a/bricktracker/metadata.py +++ b/bricktracker/metadata.py @@ -60,6 +60,17 @@ class BrickMetadata(BrickRecord): id=self.fields.id, ) + # Grab data from a form + def from_form(self, form: dict[str, str], /) -> Self: + name = form.get('name', None) + + if name is None or name == '': + raise ErrorException('Status name cannot be empty') + + self.fields.name = name + + return self + # Insert into database def insert(self, /, **context) -> None: self.safe() diff --git a/bricktracker/set_status.py b/bricktracker/set_status.py index 0165c50..d114d65 100644 --- a/bricktracker/set_status.py +++ b/bricktracker/set_status.py @@ -1,6 +1,5 @@ from typing import Self -from .exceptions import ErrorException from .metadata import BrickMetadata @@ -20,13 +19,10 @@ class BrickSetStatus(BrickMetadata): # Grab data from a form def from_form(self, form: dict[str, str], /) -> Self: - name = form.get('name', None) + super().from_form(form) + grid = form.get('grid', None) - if name is None or name == '': - raise ErrorException('Status name cannot be empty') - - self.fields.name = name self.fields.displayed_on_grid = grid == 'on' return self