OpenSlides · hjanott · Jan 29, 2025 · Nov 11, 2024 · Nov 11, 2024 · Nov 11, 2024
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,20 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+
+**How To Reproduce**
+
+**Payload from client (handle_request)**
+
+**Response from backend**
+
+**Expected behavior**
+
+**Additional context**
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "openslides-meta"]
-	path = global/meta
+	path = meta
 	url = https://github.com/OpenSlides/openslides-meta.git
diff --git a/Dockerfile b/Dockerfile
@@ -18,7 +18,8 @@ ENV PYTHONPATH /app
 COPY --chown=appuser:appuser scripts scripts
 COPY --chown=appuser:appuser entrypoint.sh ./
 COPY --chown=appuser:appuser openslides_backend openslides_backend
-COPY --chown=appuser:appuser global global
+COPY --chown=appuser:appuser meta meta
+COPY --chown=appuser:appuser data data
 
 ARG VERSION=dev
 RUN echo "$VERSION" > openslides_backend/version.txt

diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 # Development and testing inside docker container or without docker (only unit and integration tests)
 
-paths = openslides_backend/ tests/ cli/ global/meta/dev/src/
+paths = openslides_backend/ tests/ cli/ meta/dev/src/
 
 all: pyupgrade black autoflake isort flake8 mypy
 
@@ -40,7 +40,7 @@ test-unit-integration:
 check-all: validate-models-yml check-models check-initial-data-json check-example-data-json check-permissions
 
 validate-models-yml:
-	make -C global/meta/dev validate-models
+	make -C meta/dev validate-models
 
 generate-models:
 	python cli/generate_models.py $(MODELS_PATH)
@@ -57,10 +57,10 @@ check-permissions:
 	python cli/generate_permissions.py --check
 
 check-initial-data-json:
-	python cli/check_json.py global/data/initial-data.json
+	python cli/check_json.py data/initial-data.json
 
 check-example-data-json:
-	python cli/check_json.py global/data/example-data.json
+	python cli/check_json.py data/example-data.json
 
 run-debug:
 	OPENSLIDES_DEVELOPMENT=1 python -m openslides_backend

diff --git a/README.md b/README.md
@@ -47,7 +47,7 @@ To generate a new models.py file run (inside the docker container)
 
     $ make generate-models
 
-The original models.yml is now included in this repository at global/meta/. If you do not want to generate from the current backend, you can provide either a local path or an URL via the variable `MODELS_PATH`. This way, you can generate only partial changes if multiple changes to the models file were merged into the main:
+The original models.yml is now included in this repository at meta/. If you do not want to generate from the current backend, you can provide either a local path or a URL via the variable `MODELS_PATH`. This way, you can generate only partial changes if multiple changes to the models file were merged into the main:
 
     $ MODEL_PATH="local path or GitHub link" make generate-models
 

diff --git a/cli/generate_models.py b/cli/generate_models.py
@@ -20,7 +20,7 @@
 )
 from openslides_backend.shared.patterns import KEYSEPARATOR, Collection
 
-SOURCE = "./global/meta/models.yml"
+SOURCE = "./meta/models.yml"
 
 DESTINATION = os.path.abspath(
     os.path.join(

diff --git a/cli/generate_permissions.py b/cli/generate_permissions.py
@@ -10,7 +10,7 @@
 from cli.util.util import assert_equal, open_output, open_yml_file, parse_arguments
 from openslides_backend.permissions.get_permission_parts import get_permission_parts
 
-SOURCE = "./global/meta/permission.yml"
+SOURCE = "./meta/permission.yml"
 
 DESTINATION = os.path.abspath(
     os.path.join(

diff --git a/global/data/example-data.json → data/example-data.json b/global/data/example-data.json → data/example-data.json
@@ -1,5 +1,5 @@
 {
-    "_migration_index": 63,
+    "_migration_index": 64,
     "gender":{
         "1":{
             "id": 1,
@@ -72,7 +72,8 @@
                 "gender": "gender",
                 "pronoun": "pronoun",
                 "is_active": "is_active",
-                "is_physical_person": "is_person"
+                "is_physical_person": "is_person",
+                "member_number": "member_number"
               }
         }
     },
@@ -1556,7 +1557,7 @@
             "recommendation_label": "Acceptance",
             "css_class": "green",
             "set_number": true,
-            "merge_amendment_into_final": "undefined",
+            "merge_amendment_into_final": "do_merge",
             "previous_state_ids": [
                 1
             ],
@@ -1578,7 +1579,7 @@
             "recommendation_label": "Rejection",
             "css_class": "red",
             "set_number": true,
-            "merge_amendment_into_final": "undefined",
+            "merge_amendment_into_final": "do_not_merge",
             "previous_state_ids": [
                 1
             ],

diff --git a/global/data/initial-data.json → data/initial-data.json b/global/data/initial-data.json → data/initial-data.json
@@ -1,5 +1,5 @@
 {
-    "_migration_index": 63, 
+    "_migration_index": 64, 
     "gender":{
         "1":{
             "id": 1,
@@ -58,7 +58,8 @@
                 "gender": "gender",
                 "pronoun": "pronoun",
                 "is_active": "is_active",
-                "is_physical_person": "is_person"
+                "is_physical_person": "is_person",
+                "member_number": "member_number"
               }
         }
     },

diff --git a/dev/Dockerfile.dev b/dev/Dockerfile.dev
@@ -13,8 +13,9 @@ COPY dev/cleanup.sh .
 
 # Copy files which are mounted to make the full stack work
 COPY scripts scripts
-COPY global global
 COPY cli cli
+COPY data data
+COPY meta meta
 
 COPY Makefile .
 COPY setup.cfg .

diff --git a/dev/docker-compose.dev.yml b/dev/docker-compose.dev.yml
@@ -15,7 +15,9 @@ services:
             - ../openslides_backend:/app/openslides_backend
             - ../tests:/app/tests
             - ../cli:/app/cli
-            - ../global:/app/global
+            - ../data:/app/data
+            - ../meta:/app/meta
+            - ../requirements:/app/requirements
             - ../scripts:/app/scripts
         environment:
             - DATASTORE_READER_HOST=datastore-reader

diff --git a/docs/Presenters-Overview.md b/docs/Presenters-Overview.md
@@ -6,6 +6,7 @@ Available presenters:
 - [get_forwarding_meetings](presenters/get_forwarding_meetings.md)
 - [get_meetings](presenters/get_meetings.md)
 - [get_users](presenters/get_users.md)
+- [get_user_editable](presenters/get_user_editable.md)
 - [get_user_related_models](presenters/get_user_related_models.md)
 - [get_user_scope](presenters/get_user_scope.md)
 - [search_deleted_models](presenters/search_deleted_models.md)

diff --git a/docs/actions/assignment.update.md b/docs/actions/assignment.update.md
@@ -20,5 +20,7 @@
 ## Action
 Updates an assignment.
 
+If phase is newly set to `voting`, the candidates of the assignment are put in the assignments `list_of_speakers` if they are not already.
+
 ## Permissions
 The user needs `assignment.can_manage`.
diff --git a/docs/actions/group.update.md b/docs/actions/group.update.md
@@ -12,7 +12,7 @@
 ```
 
 ## Action
-Updates the group. Permissions are restricted to the following enum: https://github.com/OpenSlides/openslides-backend/blob/fae36a0b055bbaa463da4768343080c285fe8178/global/meta/models.yml#L1621-L1656
+Updates the group. Permissions are restricted to the group.permissions enum inside https://github.com/OpenSlides/openslides-meta/blob/main/models.yml.
 
 If the group is the meetings anonymous group, the name may not be changed and the permissions have to be in the following whitelist:
 - agenda_item.can_see,
@@ -27,6 +27,7 @@ If the group is the meetings anonymous group, the name may not be changed and th
 - meeting.can_see_livestream,
 - motion.can_see,
 - motion.can_see_internal,
+- poll.can_see_progress,
 - projector.can_see,
 - user.can_see,
 - user.can_see_sensitive_data

diff --git a/docs/actions/meeting.create.md b/docs/actions/meeting.create.md
@@ -24,10 +24,10 @@
 It has to be checked whether the `organization.limit_of_meetings` is unlimited (=0) or lower than the amount of active meetings in `organization.active_meeting_ids`.
 
 When creating a meeting the following objects have to be created, too:
-- Groups: `Default`, `Admin`, `Delegates`, `Staff`, `Committees`. The first one is set as `meeting/default_group_id`, the second one as `meeting/admin_group_id`. The permissions can be found in the [initial-data.json](https://github.com/OpenSlides/openslides-backend/tree/main/global/data/initial-data.json)).
+- Groups: `Default`, `Admin`, `Delegates`, `Staff`, `Committees`. The first one is set as `meeting/default_group_id`, the second one as `meeting/admin_group_id`. The permissions can be found in the [initial-data.json](https://github.com/OpenSlides/openslides-backend/tree/main/data/initial-data.json)).
 - Projector: One projector named `"Default projector"` must be created and set as `meeting/reference_projector_id`.
 - All default projectors (`meeting/default_projector_*_ids`, see `models.yml`) must be set to the one projector
-- Motion workflow and states: Create one workflow `"simple workflow"` which is set as `meeting/motions_default_workflow_id` and `meeting/motions_default_amendment_workflow_id`. Create four states (analog as in the [initial-data.json](https://github.com/OpenSlides/openslides-backend/tree/main/global/data/initial-data.json)).
+- Motion workflow and states: Create one workflow `"simple workflow"` which is set as `meeting/motions_default_workflow_id` and `meeting/motions_default_amendment_workflow_id`. Create four states (analog as in the [initial-data.json](https://github.com/OpenSlides/openslides-backend/tree/main/data/initial-data.json)).
 - Two countdowns are created and set as `meeting/list_of_speakers_countdown` (name: "List of speakers countdown") and `meeting/voting_countdown` (name: "Voting countdown").
 
 If `user_ids` are given, it must be checked that it is a subset of `committee/user_ids`. Each user is added to the meeting by being added to the default group.

diff --git a/docs/actions/meeting.update.md b/docs/actions/meeting.update.md
@@ -78,6 +78,7 @@
     motions_enable_reason_on_projector: boolean;
     motions_enable_sidebox_on_projector: boolean;
     motions_enable_recommendation_on_projector: boolean;
+    motions_create_enable_additional_submitter_text:boolean;
     motions_show_referring_motions: boolean;
     motions_show_sequential_number: boolean;
     motions_recommendations_by: string;

diff --git a/docs/actions/motion.create.md b/docs/actions/motion.create.md
@@ -56,7 +56,8 @@ This is the logic for other fields depending on the motion type:
 
 There are some fields that need special attention:
 - `workflow_id`: If it is given, the motion's state is set to the workflow's first state. The workflow must be from the same meeting. If the field is not given, one of the three default (`meeting/motions_default_workflow_id` or `meeting/motions_default_amendment_workflow_id`) workflows is used depending on the type of the motion to create.
-- `submitter_ids`: These are **user ids** and not ids of the `submitter` model. If nothing is given (`[]`), the request user's id is used. For each id in the list a `motion_submitter` model is created. The weight must be set to the order of the given list.
+- `additional_submitter` a text field where text-based submitter information may be entered. Cannot be set unless `meeting/motions_create_enable_additional_submitter_text` is `true`. Requires permissions `Motion.CAN_CREATE` and `Motion.CAN_MANAGE_METADATA`.
+- `submitter_ids`: These are **user ids** and not ids of the `motion_submitter` model. If nothing is given (`[]`) and the field `additional_submitter` isn't filled, the request user's id is used. For each id in the list a `motion_submitter` model is created. The weight must be set to the order of the given list. Requires permissions `Motion.CAN_CREATE`, `Motion.CAN_MANAGE_METADATA` and `User.CAN_SEE`.
 - `agenda_*`: See [Agenda](https://github.com/OpenSlides/OpenSlides/wiki/Agenda#additional-fields-during-creation-of-agenda-content-objects).
 
 Other things to do when creating motions:

diff --git a/docs/actions/motion.import.md b/docs/actions/motion.import.md
diff --git a/docs/actions/motion.json_upload.md b/docs/actions/motion.json_upload.md
diff --git a/docs/actions/option.update.md b/docs/actions/option.update.md
@@ -20,4 +20,4 @@ If the poll's state is *created* and at least one vote value is given (`Y`, `N`
 The request user needs:
 - `motion.can_manage_polls` if the poll's content object is a motion
 - `assignment.can_manage` if the poll's content object is an assignment
-- `poll.can_manage` else
+- `poll.can_manage` if the poll's content object is a topic