diff --git a/CHANGELOG.md b/CHANGELOG.md index 20691f6..781a26c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,13 +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.4 (2026-05-30) - -### Fix - -- add "delete log" support for data export to farmOS -- sort farmOS data fetch when importing/exporting logs - ## v0.11.3 (2026-05-04) ### Fix diff --git a/pyproject.toml b/pyproject.toml index 6956f88..4012f79 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,7 +5,7 @@ build-backend = "hatchling.build" [project] name = "WuttaFarm" -version = "0.11.4" +version = "0.11.3" description = "Web app to integrate with and extend farmOS" readme = "README.md" authors = [ diff --git a/src/wuttafarm/farmos/importing/model.py b/src/wuttafarm/farmos/importing/model.py index e7ebe23..011a170 100644 --- a/src/wuttafarm/farmos/importing/model.py +++ b/src/wuttafarm/farmos/importing/model.py @@ -781,11 +781,7 @@ class ToFarmOSLog(ToFarmOS): self.normal = self.app.get_normalizer(self.farmos_client) def get_target_objects(self, **kwargs): - # nb. must sort the data or else paging / iteration will not - # work correctly and we get back data set which contains - # duplicates but also is missing some records... - params = {"sort": "drupal_internal__id"} - return list(self.farmos_client.log.iterate(self.farmos_log_type, params=params)) + return list(self.farmos_client.log.iterate(self.farmos_log_type)) def get_target_object(self, key): @@ -910,11 +906,6 @@ class ToFarmOSLog(ToFarmOS): payload = {"attributes": attrs, "relationships": rels} return payload - def delete_target_object(self, obj): - if not self.dry_run: - self.farmos_client.log.delete(self.farmos_log_type, obj["id"]) - return True - class ActivityLogImporter(ToFarmOSLog): diff --git a/src/wuttafarm/importing/farmos.py b/src/wuttafarm/importing/farmos.py index eb82fe1..4f5a47a 100644 --- a/src/wuttafarm/importing/farmos.py +++ b/src/wuttafarm/importing/farmos.py @@ -1254,11 +1254,7 @@ class LogImporterBase(FromFarmOS, ToWutta): def get_source_objects(self): """ """ log_type = self.get_farmos_log_type() - # nb. must sort the data or else paging / iteration will not - # work correctly and we get back data set which contains - # duplicates but also is missing some records... - params = {"sort": "drupal_internal__id"} - return list(self.farmos_client.log.iterate(log_type, params=params)) + return list(self.farmos_client.log.iterate(log_type)) def normalize_source_object(self, log): """ """