Skip to content

Commit

Permalink
Merge staging/4.2.2 into stable/4.2.x. Update 20250212
Browse files Browse the repository at this point in the history
  • Loading branch information
peb-adr committed Feb 12, 2025
2 parents f2873ad + ed2660a commit 0c28294
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 13 deletions.
2 changes: 1 addition & 1 deletion dev/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
autoflake==2.3.1
black==24.10.0
flake8==7.1.1
isort==5.13.2
isort==6.0.0
mypy==1.14.1
pytest==8.3.4
pyupgrade==3.19.1
Expand Down
26 changes: 14 additions & 12 deletions models.yml
Original file line number Diff line number Diff line change
Expand Up @@ -449,11 +449,13 @@ meeting_user:
type: relation-list
to: motion_editor/meeting_user_id
equal_fields: meeting_id
on_delete: CASCADE
restriction_mode: A
motion_working_group_speaker_ids:
type: relation-list
to: motion_working_group_speaker/meeting_user_id
equal_fields: meeting_id
on_delete: CASCADE
restriction_mode: A
motion_submitter_ids:
type: relation-list
Expand Down Expand Up @@ -752,7 +754,7 @@ meeting:
id: *id_field
external_id:
type: string
restriction_mode: A
restriction_mode: F
description: unique in committee
welcome_title:
type: string
Expand All @@ -773,12 +775,12 @@ meeting:
is_active_in_organization_id:
type: relation
to: organization/active_meeting_ids
restriction_mode: A
restriction_mode: F
description: Backrelation and boolean flag at once
is_archived_in_organization_id:
type: relation
to: organization/archived_meeting_ids
restriction_mode: A
restriction_mode: F
description: Backrelation and boolean flag at once
description:
type: string
Expand All @@ -787,22 +789,22 @@ meeting:
restriction_mode: B
location:
type: string
restriction_mode: A
restriction_mode: F
start_time:
type: timestamp
restriction_mode: A
restriction_mode: F
end_time:
type: timestamp
restriction_mode: A
restriction_mode: F
locked_from_inside:
type: boolean
restriction_mode: A
restriction_mode: F
imported_at:
type: timestamp
restriction_mode: B
language:
type: string
restriction_mode: A
restriction_mode: F
enum: *languages
required: true
constant: true
Expand All @@ -826,7 +828,7 @@ meeting:
enable_anonymous:
type: boolean
default: False
restriction_mode: A
restriction_mode: F
custom_translations:
type: JSON
restriction_mode: B
Expand Down Expand Up @@ -1122,12 +1124,12 @@ meeting:
- inline
- none
default: outside
restriction_mode: B
restriction_mode: A
motions_line_length:
type: number
minimum: 40
default: 85
restriction_mode: B
restriction_mode: A
motions_reason_required:
type: boolean
default: False
Expand Down Expand Up @@ -1304,7 +1306,7 @@ meeting:
meeting_user_ids:
type: relation-list
to: meeting_user/meeting_id
restriction_mode: A
restriction_mode: F
on_delete: CASCADE
users_enable_presence_view:
type: boolean
Expand Down

0 comments on commit 0c28294

Please sign in to comment.