From f6a769b6d86b55d9460f102eb6b2d3b7fac86b54 Mon Sep 17 00:00:00 2001 From: Ludwig Reiter Date: Wed, 26 Nov 2025 10:30:41 +0100 Subject: [PATCH 1/3] Add required_majority fields with enum --- models.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/models.yml b/models.yml index 4369b52b..7e3613f0 100644 --- a/models.yml +++ b/models.yml @@ -86,6 +86,10 @@ _meta: # meta field to hold repeatedly used values - "entitled" - "entitled_present" - "disabled" + required_majority: &required_majority + - "no_majority" + - "two_third_majority" + - "absolute_majority" id_field: &id_field type: number restriction_mode: A @@ -1321,6 +1325,11 @@ meeting: enum: *onehundred_percent_bases default: YNA restriction_mode: B + motion_poll_default_required_majority: + type: string + enum: *required_majority + default: no_majority + restriction_mode: B motion_poll_default_group_ids: type: relation-list to: group/used_as_motion_poll_default_id @@ -1485,6 +1494,11 @@ meeting: enum: *onehundred_percent_bases default: valid restriction_mode: B + assignment_poll_default_required_majority: + type: string + enum: *required_majority + default: no_majority + restriction_mode: B assignment_poll_default_group_ids: type: relation-list to: group/used_as_assignment_poll_default_id @@ -3291,6 +3305,11 @@ poll: enum: *onehundred_percent_bases default: disabled restriction_mode: A + required_majority: + type: string + enum: *required_majority + default: no_majority + restriction_mode: A votesvalid: type: decimal(6) restriction_mode: B From 7586ade953b0f13600cd19dce59632b7c9601f89 Mon Sep 17 00:00:00 2001 From: Ludwig Reiter Date: Thu, 27 Nov 2025 09:25:24 +0100 Subject: [PATCH 2/3] Remove 'no_majority' and defaults from required majority fields --- models.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/models.yml b/models.yml index 7e3613f0..8ebe9674 100644 --- a/models.yml +++ b/models.yml @@ -87,7 +87,6 @@ _meta: # meta field to hold repeatedly used values - "entitled_present" - "disabled" required_majority: &required_majority - - "no_majority" - "two_third_majority" - "absolute_majority" id_field: &id_field @@ -1328,7 +1327,6 @@ meeting: motion_poll_default_required_majority: type: string enum: *required_majority - default: no_majority restriction_mode: B motion_poll_default_group_ids: type: relation-list @@ -1497,7 +1495,6 @@ meeting: assignment_poll_default_required_majority: type: string enum: *required_majority - default: no_majority restriction_mode: B assignment_poll_default_group_ids: type: relation-list @@ -3308,7 +3305,6 @@ poll: required_majority: type: string enum: *required_majority - default: no_majority restriction_mode: A votesvalid: type: decimal(6) From bf9efdb2b968744bb3ba98b84c6febc8d85767d1 Mon Sep 17 00:00:00 2001 From: Ludwig Reiter Date: Fri, 28 Nov 2025 09:00:36 +0100 Subject: [PATCH 3/3] Revert "Remove 'no_majority' and defaults from required majority fields" This reverts commit 7586ade953b0f13600cd19dce59632b7c9601f89. --- models.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/models.yml b/models.yml index 8ebe9674..7e3613f0 100644 --- a/models.yml +++ b/models.yml @@ -87,6 +87,7 @@ _meta: # meta field to hold repeatedly used values - "entitled_present" - "disabled" required_majority: &required_majority + - "no_majority" - "two_third_majority" - "absolute_majority" id_field: &id_field @@ -1327,6 +1328,7 @@ meeting: motion_poll_default_required_majority: type: string enum: *required_majority + default: no_majority restriction_mode: B motion_poll_default_group_ids: type: relation-list @@ -1495,6 +1497,7 @@ meeting: assignment_poll_default_required_majority: type: string enum: *required_majority + default: no_majority restriction_mode: B assignment_poll_default_group_ids: type: relation-list @@ -3305,6 +3308,7 @@ poll: required_majority: type: string enum: *required_majority + default: no_majority restriction_mode: A votesvalid: type: decimal(6)