diff --git a/CHANGELOG.md b/CHANGELOG.md index 4ee6b10..6c85559 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,16 +5,6 @@ All notable changes to WuttaFarm will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). -## v0.11.0 (2026-03-15) - -### Feat - -- show basic map for "fixed" assets - -### Fix - -- include LogQuantity changes when viewing Log revision - ## v0.10.0 (2026-03-11) ### Feat diff --git a/pyproject.toml b/pyproject.toml index c1a5cc0..7fdd859 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,7 +5,7 @@ build-backend = "hatchling.build" [project] name = "WuttaFarm" -version = "0.11.0" +version = "0.10.0" description = "Web app to integrate with and extend farmOS" readme = "README.md" authors = [ @@ -34,7 +34,7 @@ dependencies = [ "pyramid_exclog", "uvicorn[standard]", "WuttaSync", - "WuttaWeb[continuum]>=0.29.3", + "WuttaWeb[continuum]>=0.29.2", ] diff --git a/src/wuttafarm/web/templates/assets/master/view.mako b/src/wuttafarm/web/templates/assets/master/view.mako index 5b7b822..dac5a1c 100644 --- a/src/wuttafarm/web/templates/assets/master/view.mako +++ b/src/wuttafarm/web/templates/assets/master/view.mako @@ -10,74 +10,5 @@ % endif -
- - ## main form -
- ${parent.page_content()} -
- - ## location map - % if map_polygon: -
- % endif - -
- - - -<%def name="modify_vue_vars()"> - ${parent.modify_vue_vars()} - % if map_polygon: - - % endif + ${parent.page_content()} diff --git a/src/wuttafarm/web/templates/base.mako b/src/wuttafarm/web/templates/base.mako index caa5c67..b28b52f 100644 --- a/src/wuttafarm/web/templates/base.mako +++ b/src/wuttafarm/web/templates/base.mako @@ -1,16 +1,6 @@ <%inherit file="wuttaweb:templates/base.mako" /> <%namespace file="/wuttafarm-components.mako" import="make_wuttafarm_components" /> -<%def name="head_tags()"> - ${parent.head_tags()} - - ## TODO: this likely does not belong in the base template, and should be - ## included per template where actually needed. but this is easier for now. - - - - - <%def name="index_title_controls()"> ${parent.index_title_controls()} diff --git a/src/wuttafarm/web/views/assets.py b/src/wuttafarm/web/views/assets.py index 35c3b21..64f4dbc 100644 --- a/src/wuttafarm/web/views/assets.py +++ b/src/wuttafarm/web/views/assets.py @@ -23,7 +23,6 @@ Master view for Assets """ -import re from collections import OrderedDict from webhelpers2.html import tags @@ -360,36 +359,6 @@ class AssetMasterView(WuttaFarmMasterView): return buttons - def get_template_context(self, context): - context = super().get_template_context(context) - - if self.viewing: - asset = context["instance"] - - # add location geometry if applicable - if asset.is_fixed and asset.farmos_uuid and not self.app.is_standalone(): - - # TODO: eventually sync GIS data, avoid this API call? - client = get_farmos_client_for_user(self.request) - result = client.asset.get_id(asset.asset_type, asset.farmos_uuid) - geometry = result["data"]["attributes"]["intrinsic_geometry"] - - context["map_center"] = [geometry["lon"], geometry["lat"]] - - context["map_bounds"] = [ - [geometry["left"], geometry["bottom"]], - [geometry["right"], geometry["top"]], - ] - - if match := re.match( - r"^POLYGON \(\((?P[^\)]+)\)\)$", geometry["value"] - ): - points = match.group("points").split(", ") - points = [[float(pt) for pt in pair.split(" ")] for pair in points] - context["map_polygon"] = [points] - - return context - def get_version_joins(self): """ We override this to declare the relationship between the diff --git a/src/wuttafarm/web/views/logs.py b/src/wuttafarm/web/views/logs.py index 2a4e6e0..3d91ba1 100644 --- a/src/wuttafarm/web/views/logs.py +++ b/src/wuttafarm/web/views/logs.py @@ -491,7 +491,6 @@ class LogMasterView(WuttaFarmMasterView): return super().get_version_joins() + [ model.Log, (model.LogAsset, "log_uuid", "uuid"), - (model.LogQuantity, "log_uuid", "uuid"), ]