only force data sharing choice when user picks individual

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
dirkhh · Jun 16, 2024 · 8ce1ef1 · 8ce1ef1
1 parent 729c6f2
commit 8ce1ef1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/release-notes.md b/release-notes.md
@@ -1,4 +1,5 @@
 Changes since v2.1.0 include:
+- Basic Setup: don't force the user to go through the data sharing page if they pick "all" or "privacy" during basic setup
 - DietPi builds: don't clone the feeder image on first boot - we use custom DietPi images that have the correct version pre-installed
 - hotspot dietpi: join the network much quicker
 - hotspot raspbian: avoid possible race condition that would stop the hotspot from starting

diff --git a/src/modules/adsb-feeder/filesystem/root/opt/adsb/adsb-setup/app.py b/src/modules/adsb-feeder/filesystem/root/opt/adsb/adsb-setup/app.py
@@ -1972,11 +1972,14 @@ def do_halt():
                     unique_name = self.unique_site_name(form.get("site_name"), 0)
                     self._d.env_by_tags("site_name").list_set(0, unique_name)
                     self.mdns_alias_service(unique_name)
+                # if this is a regular feeder and the user is changing to 'individual' selection
+                # (either in initial setup or when coming back to that setting later), show them
+                # the aggregator selection page next
                 if (
                     key == "aggregators"
-                    and not self._d.env_by_tags("aggregators_chosen").value
                     and not self._d.is_enabled("stage2")
-                    and not value == "micro"
+                    and value == "individual"
+                    and self._d.env_by_tags("aggregators").value != "individual"
                 ):
                     # show the aggregator selection
                     next_url = url_for("aggregators")