wutta/wuttafarm
3
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

fix: improve behavior when deleting a Standard Quantity

Browse source
This commit is contained in:
Lance Edgar 2026-03-08 16:01:12 -05:00
parent 1d5499686f
commit 6bc5f06f7a
2 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/wuttafarm/db/model/quantities.py
View file

@ -204,7 +204,12 @@ class QuantityMixin:
@declared_attr @declared_attr
def quantity(cls): def quantity(cls):
return orm.relationship(Quantity) return orm.relationship(
Quantity,
single_parent=True,
cascade="all, delete-orphan",
cascade_backrefs=False,
)
def render_as_text(self, config=None): def render_as_text(self, config=None):
return self.quantity.render_as_text(config) return self.quantity.render_as_text(config)

13
src/wuttafarm/web/views/farmos/quantities.py
View file

@ -26,6 +26,7 @@ View for farmOS Quantity Types
import datetime import datetime
import colander import colander
import requests
from wuttaweb.forms.schema import WuttaDateTime from wuttaweb.forms.schema import WuttaDateTime
from wuttaweb.forms.widgets import WuttaDateTimeWidget from wuttaweb.forms.widgets import WuttaDateTimeWidget
@ -204,9 +205,15 @@ class QuantityMasterView(FarmOSMasterView):
return qty["value"]["decimal"] return qty["value"]["decimal"]
def get_instance(self): def get_instance(self):
quantity = self.farmos_client.resource.get_id( # TODO: this pattern should be repeated for other views
"quantity", self.farmos_quantity_type, self.request.matchdict["uuid"] try:
) quantity = self.farmos_client.resource.get_id(
"quantity", self.farmos_quantity_type, self.request.matchdict["uuid"]
)
except requests.HTTPError as exc:
if exc.response.status_code == 404:
raise self.notfound()
self.raw_json = quantity self.raw_json = quantity
data = self.normalize_quantity(quantity["data"]) data = self.normalize_quantity(quantity["data"])