diff --git a/docker/initial-data.json b/docker/initial-data.json index bc8ba27f9..50c8c01a9 100644 --- a/docker/initial-data.json +++ b/docker/initial-data.json @@ -1,5 +1,5 @@ { -"organisation": [ +"organization": [ { "id": 1, "name": "OpenSlides", @@ -15,7 +15,7 @@ "committee_ids": [1], "resource_ids": [], - "organisation_tag_ids": [] + "organization_tag_ids": [] }], "user": [ { @@ -37,7 +37,7 @@ "last_email_send": null, "is_demo_user": false, - "organisation_management_level": "superadmin", + "organization_management_level": "superadmin", "is_present_in_meeting_ids": [], "committee_ids": [1], @@ -69,7 +69,7 @@ "meeting_ids": [1] }], "resource": [], -"organisation_tag": [], +"organization_tag": [], "committee": [ { "id": 1, @@ -82,8 +82,8 @@ "user_ids": [1], "forward_to_committee_ids": [], "receive_forwardings_from_committee_ids": [], - "organisation_tag_ids": [], - "organisation_id": 1 + "organization_tag_ids": [], + "organization_id": 1 }], "meeting": [ { @@ -253,7 +253,7 @@ "committee_id": 1, "default_meeting_for_committee_id": 1, - "organisation_tag_ids": [], + "organization_tag_ids": [], "present_user_ids": [], "user_ids": [1], "reference_projector_id": 1, diff --git a/docs/example-data.json b/docs/example-data.json index 2ce5f167e..302ee4788 100644 --- a/docs/example-data.json +++ b/docs/example-data.json @@ -1,5 +1,5 @@ { -"organisation": [ +"organization": [ { "id": 1, "legal_notice": "OpenSlides is a free web based presentation and assembly system for visualizing and controlling agenda, motions and elections of an assembly.", @@ -9,12 +9,12 @@ "custom_translations": [], "enable_electronic_voting": true, "reset_password_verbose_errors": true, - "name": "Test Organisation", + "name": "Test Organization", "description": "", "committee_ids": [1], "resource_ids": [1], - "organisation_tag_ids": [1] + "organization_tag_ids": [1] }], "user": [ { @@ -36,7 +36,7 @@ "last_email_send": null, "is_demo_user": false, - "organisation_management_level": "superadmin", + "organization_management_level": "superadmin", "is_present_in_meeting_ids": [1], "committee_ids": [1], @@ -99,7 +99,7 @@ "last_email_send": null, "is_demo_user": false, - "organisation_management_level": "", + "organization_management_level": "", "is_present_in_meeting_ids": [], "committee_ids": [1], @@ -156,7 +156,7 @@ "last_email_send": null, "is_demo_user": false, - "organisation_management_level": "", + "organization_management_level": "", "is_present_in_meeting_ids": [], "committee_ids": [], @@ -201,16 +201,16 @@ "token": "web_header", "filesize": 1462, "mimetype": "image/png", - "organisation_id": 1 + "organization_id": 1 } ], -"organisation_tag": [ +"organization_tag": [ { "id": 1, "name": "Orga Tag 1", "color": "#317796", "tagged_ids": ["committee/1", "meeting/1"], - "organisation_id": 1 + "organization_id": 1 } ], "committee": [ @@ -225,8 +225,8 @@ "user_ids": [1, 2], "forward_to_committee_ids": [], "receive_forwardings_from_committee_ids": [], - "organisation_tag_ids": [1], - "organisation_id": 1 + "organization_tag_ids": [1], + "organization_id": 1 }], "meeting": [ { @@ -397,7 +397,7 @@ "committee_id": 1, "default_meeting_for_committee_id": 1, - "organisation_tag_ids": [1], + "organization_tag_ids": [1], "present_user_ids": [1], "user_ids": [1, 2, 3], "reference_projector_id": 2, diff --git a/docs/models.yml b/docs/models.yml index 7ba96ef41..f97bd2886 100644 --- a/docs/models.yml +++ b/docs/models.yml @@ -61,7 +61,7 @@ # - The property `equal_fields` describes fields that must have the same value in # the instance and the related instance. -organisation: +organization: id: number name: string description: HTMLStrict @@ -80,13 +80,13 @@ organisation: committee_ids: type: relation-list - to: committee/organisation_id + to: committee/organization_id resource_ids: type: relation-list - to: resource/organisation_id - organisation_tag_ids: + to: resource/organization_id + organization_tag_ids: type: relation-list - to: organisation_tag/organisation_id + to: organization_tag/organization_id user: id: number @@ -116,13 +116,13 @@ user: is_demo_user: type: boolean - # Organisation, meeting and committee - organisation_management_level: + # Organization, meeting and committee + organization_management_level: type: string - description: Hierarchical permission level for the whole organisation. + description: Hierarchical permission level for the whole organization. enum: - superadmin - - can_manage_organisation + - can_manage_organization - can_manage_users is_present_in_meeting_ids: type: relation-list @@ -135,7 +135,7 @@ user: committee_$_management_level: type: template replacement_collection: committee - description: Hierarchical permission level for the each committee organisation. + description: Hierarchical permission level for the each committee organization. fields: type: string enum: @@ -256,7 +256,7 @@ user: # New: Resource # Resources are organsation wide "mediafiles", like logos for the organisatio or -# organisation-wide fonts. Therefore, no permission checks are done and the user +# organization-wide fonts. Therefore, no permission checks are done and the user # must not be logged in to retrieve files. A resource has a token, e.g. `web_header` # or `pdf_font_italic`, so the client knowns, where to put the resource. resource: @@ -265,11 +265,11 @@ resource: filesize: number mimetype: string - organisation_id: + organization_id: type: relation - to: organisation/resource_ids + to: organization/resource_ids -organisation_tag: +organization_tag: id: number name: type: string @@ -284,10 +284,10 @@ organisation_tag: collections: - committee - meeting - field: organisation_tag_ids - organisation_id: + field: organization_tag_ids + organization_id: type: relation - to: organisation/organisation_tag_ids + to: organization/organization_tag_ids committee: id: number @@ -315,12 +315,12 @@ committee: receive_forwardings_from_committee_ids: type: relation-list to: committee/forward_to_committee_ids - organisation_tag_ids: + organization_tag_ids: type: relation-list - to: organisation_tag/tagged_ids - organisation_id: + to: organization_tag/tagged_ids + organization_id: type: relation - to: organisation/committee_ids + to: organization/committee_ids required: true meeting: @@ -872,9 +872,9 @@ meeting: default_meeting_for_committee_id: type: relation to: committee/default_meeting_id - organisation_tag_ids: + organization_tag_ids: type: relation-list - to: organisation_tag/tagged_ids + to: organization_tag/tagged_ids present_user_ids: type: relation-list to: user/is_present_in_meeting_ids diff --git a/openslides-auth-service b/openslides-auth-service index 10d78e1f0..8a32b4ac0 160000 --- a/openslides-auth-service +++ b/openslides-auth-service @@ -1 +1 @@ -Subproject commit 10d78e1f03a580c985568774bd6e793be5a66578 +Subproject commit 8a32b4ac03ddf40765c15dea44b703b5fa1370c4 diff --git a/openslides-autoupdate-service b/openslides-autoupdate-service index 2bc88271b..285d61359 160000 --- a/openslides-autoupdate-service +++ b/openslides-autoupdate-service @@ -1 +1 @@ -Subproject commit 2bc88271b37afa9f6fa1ce1418e85464e7c8cc9e +Subproject commit 285d6135961b68c590dd800b7ef78fa9bf4c505e diff --git a/openslides-backend b/openslides-backend index 4470bb807..8bc8547a8 160000 --- a/openslides-backend +++ b/openslides-backend @@ -1 +1 @@ -Subproject commit 4470bb80746dafb1988d3d41c5768fe4f1cee4e0 +Subproject commit 8bc8547a8ad105e254d86ac395105e39168b7933 diff --git a/openslides-client b/openslides-client index 51629fad1..38ae5abb7 160000 --- a/openslides-client +++ b/openslides-client @@ -1 +1 @@ -Subproject commit 51629fad1e8f6badaa7209511d945082a52edb70 +Subproject commit 38ae5abb7f77e7895849be79530340aa77fdad72 diff --git a/openslides-datastore-service b/openslides-datastore-service index 488b22458..4f32125ad 160000 --- a/openslides-datastore-service +++ b/openslides-datastore-service @@ -1 +1 @@ -Subproject commit 488b22458b978bc75a6fab219a515d516a90a794 +Subproject commit 4f32125ad393269d33715e6097332023f2192b84 diff --git a/openslides-manage-service b/openslides-manage-service index 869427c0f..d91c6bcbe 160000 --- a/openslides-manage-service +++ b/openslides-manage-service @@ -1 +1 @@ -Subproject commit 869427c0f5b90d45189a075c0f7a04dc066f9e38 +Subproject commit d91c6bcbec3a40b388bbe020b6033800c6168f19 diff --git a/openslides-permission-service b/openslides-permission-service index c40703f75..175dba2bd 160000 --- a/openslides-permission-service +++ b/openslides-permission-service @@ -1 +1 @@ -Subproject commit c40703f752e75ab32422f9866e1456c539d5661d +Subproject commit 175dba2bd4d9d58b91a9fb9d1092411780777259