Merge upstream/final-form into master

Incorporates WIP alternative measurement form (single select form with
multiple select actions) and readouts controller.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
2026-03-13 02:38:09 +00:00
11 changed files with 62 additions and 76 deletions

View File

@@ -85,7 +85,7 @@ en:
navigation: Measurements
no_items: There are no measurements taken. You can Add some now.
form:
select_quantity: select the measured quantities...
select_quantity: select the measured quantity...
index:
new_measurement: Add measurement
create:
@@ -97,6 +97,7 @@ en:
readouts:
form:
select_unit: ...
new_children: Children
quantities:
navigation: Quantities
no_items: There are no configured quantities. You can Add some or Import from defaults.

View File

@@ -4,6 +4,7 @@ Rails.application.routes.draw do
resources :measurements
resources :readouts, only: [:new] do
collection {get 'new/:id/discard', action: :discard, as: :discard}
end