Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into 121-public-mediafiles
Browse files Browse the repository at this point in the history
  • Loading branch information
luisa-beerboom committed Aug 22, 2024
2 parents 54ba147 + 039a95d commit db445fe
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 6 deletions.
10 changes: 5 additions & 5 deletions dev/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
autoflake==2.3.1
black==24.4.2
flake8==7.1.0
black==24.8.0
flake8==7.1.1
isort==5.13.2
mypy==1.11.1
pytest==8.3.2
pyupgrade==3.17.0
pyyaml==6.0.1
simplejson==3.19.2
pyyaml==6.0.2
simplejson==3.19.3

# typing
types-PyYAML==6.0.12.20240724
types-PyYAML==6.0.12.20240808
types-simplejson==3.19.0.20240801
11 changes: 10 additions & 1 deletion models.yml
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ organization:
to: committee/organization_id
active_meeting_ids:
type: relation-list
restriction_mode: B
restriction_mode: A
to: meeting/is_active_in_organization_id
archived_meeting_ids:
type: relation-list
Expand Down Expand Up @@ -1850,6 +1850,10 @@ meeting:
type: relation
to: group/admin_group_for_meeting_id
restriction_mode: B
anonymous_group_id:
type: relation
to: group/anonymous_group_for_meeting_id
restriction_mode: B

structure_level:
id:
Expand Down Expand Up @@ -1959,6 +1963,11 @@ group:
to: meeting/admin_group_id
on_delete: PROTECT
restriction_mode: A
anonymous_group_for_meeting_id:
type: relation
to: meeting/anonymous_group_id
on_delete: PROTECT
restriction_mode: A
mediafile_access_group_ids:
type: relation-list
to: meeting_mediafile/access_group_ids
Expand Down

0 comments on commit db445fe

Please sign in to comment.