From d413f04585a5f7003e92a842f99dd285b3276306 Mon Sep 17 00:00:00 2001 From: Ralf Peschke Date: Thu, 18 Feb 2021 11:06:20 +0100 Subject: [PATCH 1/3] Proposal for permissions in initial-data.json --- docker/initial-data.json | 54 ++++++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 24 deletions(-) diff --git a/docker/initial-data.json b/docker/initial-data.json index 4c70f899b..abaa7be57 100644 --- a/docker/initial-data.json +++ b/docker/initial-data.json @@ -258,14 +258,17 @@ "id": 1, "name": "Default", "permissions": [ - "agenda_item.can_see", - "agenda_item.can_see_internals", + "agenda_item.can_see_internal", "assignment.can_see", "meeting.can_see_frontpage", "projector.can_see", "mediafile.can_see", "motion.can_see", - "user.can_see" + "user.can_see", + + # Missing compared with os3 and existing permissions in models.yml + "list_of_speakers.can_see", + "user.can_change_own_password", ], "user_ids": [], @@ -304,25 +307,20 @@ "name": "Staff", "permissions": [ "agenda_item.can_manage", - "agenda_item.can_see", - "agenda_item.can_see_internals", - "agenda_item.can_be_speaker", + "list_of_speakers.can_be_speaker", "assignment.can_manage", - "assignment.can_nominate_other", "assignment.can_nominate_self", - "assignment.can_see", "projector.can_manage", "meeting.can_see_frontpage", - "projector.can_see", "tag.can_manage", "mediafile.can_manage", - "mediafile.can_see", - "motion.can_create", "motion.can_manage", - "motion.can_see", "user.can_manage", - "user.can_see_extra_data", - "user.can_see" + + # Missing compared with os3 and existing permissions in models.yml + "list_of_speakers.can_manage", + "meeting.can_see_history", + "user.can_change_own_password", ], "user_ids": [], @@ -342,16 +340,19 @@ "id": 4, "name": "Committees", "permissions": [ - "agenda_item.can_see", - "agenda_item.can_see_internals", + "agenda_item.can_see_internal", "assignment.can_see", "meeting.can_see_frontpage", "projector.can_see", "mediafile.can_see", "motion.can_create", - "motion.can_see", "motion.can_support", - "users.can_see" + "user.can_see" + # Missing permissions compared with os3 and existing permissions in models.yml + "list_of_speakers.can_see", + "motion.can_create_amendments", + "user.can_see_extra_data", + "user.can_change_own_password", ], "user_ids": [], @@ -371,20 +372,25 @@ "id": 5, "name": "Delegates", "permissions": [ - "agenda_item.can_see", - "agenda_item.can_see_internals", - "agenda_item.can_be_speaker", + "agenda_item.can_see_internal", + "list_of_speakers.can_be_speaker", "assignment.can_nominate_other", "assignment.can_nominate_self", - "assignment.can_see", "meeting.can_see_frontpage", "projector.can_see", "mediafile.can_see", - "motion.can_create", "motion.can_manage", - "motion.can_see", "motion.can_support", "user.can_see" + # Missing compared with os3 and existing permissions in models.yml + "user.can_change_own_password", + "meeting.can_see_autopilot", + + # to discuss: OS3 permissions transferred to Os4 results for motion in following permissions: + "motion.can_create", + "motion.can_create_amendments", + "motion.can_support", + ], "user_ids": [], From f3086375cc001953c520ad72b219197b3414c264 Mon Sep 17 00:00:00 2001 From: Ralf Peschke Date: Thu, 18 Feb 2021 16:49:21 +0100 Subject: [PATCH 2/3] Fix recommendations from code review --- docker/initial-data.json | 63 ++++++++++++++--------------------- docs/example-data.json | 61 +++++++++++++++------------------ openslides-autoupdate-service | 2 +- openslides-backend | 2 +- openslides-client | 2 +- openslides-datastore-service | 2 +- openslides-permission-service | 2 +- 7 files changed, 57 insertions(+), 77 deletions(-) diff --git a/docker/initial-data.json b/docker/initial-data.json index abaa7be57..ed0408a86 100644 --- a/docker/initial-data.json +++ b/docker/initial-data.json @@ -260,15 +260,13 @@ "permissions": [ "agenda_item.can_see_internal", "assignment.can_see", - "meeting.can_see_frontpage", - "projector.can_see", - "mediafile.can_see", - "motion.can_see", - "user.can_see", - - # Missing compared with os3 and existing permissions in models.yml "list_of_speakers.can_see", - "user.can_change_own_password", + "mediafile.can_see", + "meeting.can_see_frontpage", + "motion.can_see", + "projector.can_see", + "user.can_see", + "user.can_change_own_password" ], "user_ids": [], @@ -307,20 +305,18 @@ "name": "Staff", "permissions": [ "agenda_item.can_manage", - "list_of_speakers.can_be_speaker", "assignment.can_manage", "assignment.can_nominate_self", - "projector.can_manage", - "meeting.can_see_frontpage", - "tag.can_manage", - "mediafile.can_manage", - "motion.can_manage", - "user.can_manage", - - # Missing compared with os3 and existing permissions in models.yml + "list_of_speakers.can_be_speaker", "list_of_speakers.can_manage", + "mediafile.can_manage", + "meeting.can_see_frontpage", "meeting.can_see_history", - "user.can_change_own_password", + "motion.can_manage", + "projector.can_manage", + "tag.can_manage", + "user.can_manage", + "user.can_change_own_password" ], "user_ids": [], @@ -342,17 +338,14 @@ "permissions": [ "agenda_item.can_see_internal", "assignment.can_see", - "meeting.can_see_frontpage", - "projector.can_see", - "mediafile.can_see", - "motion.can_create", - "motion.can_support", - "user.can_see" - # Missing permissions compared with os3 and existing permissions in models.yml "list_of_speakers.can_see", + "mediafile.can_see", + "meeting.can_see_frontpage", + "motion.can_create", "motion.can_create_amendments", - "user.can_see_extra_data", - "user.can_change_own_password", + "motion.can_support", + "projector.can_see", + "user.can_see" ], "user_ids": [], @@ -373,24 +366,18 @@ "name": "Delegates", "permissions": [ "agenda_item.can_see_internal", - "list_of_speakers.can_be_speaker", "assignment.can_nominate_other", "assignment.can_nominate_self", - "meeting.can_see_frontpage", - "projector.can_see", + "list_of_speakers.can_be_speaker", "mediafile.can_see", - "motion.can_manage", - "motion.can_support", - "user.can_see" - # Missing compared with os3 and existing permissions in models.yml - "user.can_change_own_password", "meeting.can_see_autopilot", - - # to discuss: OS3 permissions transferred to Os4 results for motion in following permissions: + "meeting.can_see_frontpage", "motion.can_create", "motion.can_create_amendments", "motion.can_support", - + "projector.can_see", + "user.can_see", + "user.can_change_own_password" ], "user_ids": [], diff --git a/docs/example-data.json b/docs/example-data.json index 7858b6619..69609675f 100644 --- a/docs/example-data.json +++ b/docs/example-data.json @@ -394,14 +394,15 @@ "admin_group_for_meeting_id": null, "default_group_for_meeting_id": 1, "permissions": [ - "agenda_item.can_see", - "agenda_item.can_see_internals", + "agenda_item.can_see_internal", "assignment.can_see", - "meeting.can_see_frontpage", - "projector.can_see", + "list_of_speakers.can_see", "mediafile.can_see", + "meeting.can_see_frontpage", "motion.can_see", - "user.can_see" + "projector.can_see", + "user.can_see", + "user.can_change_own_password" ], "user_ids": [], @@ -440,25 +441,18 @@ "default_group_for_meeting_id": null, "permissions": [ "agenda_item.can_manage", - "agenda_item.can_see", - "agenda_item.can_see_internals", - "agenda_item.can_be_speaker", "assignment.can_manage", - "assignment.can_nominate_other", "assignment.can_nominate_self", - "assignment.can_see", - "projector.can_manage", - "meeting.can_see_frontpage", - "projector.can_see", - "tag.can_manage", + "list_of_speakers.can_be_speaker", + "list_of_speakers.can_manage", "mediafile.can_manage", - "mediafile.can_see", - "motion.can_create", + "meeting.can_see_frontpage", + "meeting.can_see_history", "motion.can_manage", - "motion.can_see", + "projector.can_manage", + "tag.can_manage", "user.can_manage", - "user.can_see_extra_data", - "user.can_see" + "user.can_change_own_password" ], "user_ids": [], @@ -478,16 +472,16 @@ "admin_group_for_meeting_id": null, "default_group_for_meeting_id": null, "permissions": [ - "agenda_item.can_see", - "agenda_item.can_see_internals", + "agenda_item.can_see_internal", "assignment.can_see", - "meeting.can_see_frontpage", - "projector.can_see", + "list_of_speakers.can_see", "mediafile.can_see", + "meeting.can_see_frontpage", "motion.can_create", - "motion.can_see", + "motion.can_create_amendments", "motion.can_support", - "users.can_see" + "projector.can_see", + "user.can_see" ], "user_ids": [], @@ -507,20 +501,19 @@ "admin_group_for_meeting_id": null, "default_group_for_meeting_id": null, "permissions": [ - "agenda_item.can_see", - "agenda_item.can_see_internals", - "agenda_item.can_be_speaker", + "agenda_item.can_see_internal", "assignment.can_nominate_other", "assignment.can_nominate_self", - "assignment.can_see", - "meeting.can_see_frontpage", - "projector.can_see", + "list_of_speakers.can_be_speaker", "mediafile.can_see", + "meeting.can_see_autopilot", + "meeting.can_see_frontpage", "motion.can_create", - "motion.can_manage", - "motion.can_see", + "motion.can_create_amendments", "motion.can_support", - "user.can_see" + "projector.can_see", + "user.can_see", + "user.can_change_own_password" ], "user_ids": [2], diff --git a/openslides-autoupdate-service b/openslides-autoupdate-service index fe5c1f669..3394779de 160000 --- a/openslides-autoupdate-service +++ b/openslides-autoupdate-service @@ -1 +1 @@ -Subproject commit fe5c1f6697173d0298b2ec92d92d321736ed0bdf +Subproject commit 3394779de7841449a3a7c776e74ab80d51d30ab3 diff --git a/openslides-backend b/openslides-backend index f7eb0e4ce..58d37a5ac 160000 --- a/openslides-backend +++ b/openslides-backend @@ -1 +1 @@ -Subproject commit f7eb0e4cec0a0563a98066bcabc5a16b7a2e4a25 +Subproject commit 58d37a5ac23d177844eadaf6d98572e028c78db8 diff --git a/openslides-client b/openslides-client index 949a8442d..00e27d828 160000 --- a/openslides-client +++ b/openslides-client @@ -1 +1 @@ -Subproject commit 949a8442db69ef5d55ed003c9d92b25a5a2a1005 +Subproject commit 00e27d828068a2d94b352d01c177ad69a628acaf diff --git a/openslides-datastore-service b/openslides-datastore-service index c68249eb4..46d1cd070 160000 --- a/openslides-datastore-service +++ b/openslides-datastore-service @@ -1 +1 @@ -Subproject commit c68249eb4ad5cca1d6e80a0eb46820873eefdc50 +Subproject commit 46d1cd070524f20eefc61654321656022a30405e diff --git a/openslides-permission-service b/openslides-permission-service index 6d97a9805..d0600fdab 160000 --- a/openslides-permission-service +++ b/openslides-permission-service @@ -1 +1 @@ -Subproject commit 6d97a98053ec76794b28bf8adf801f4a5439f5a4 +Subproject commit d0600fdab16b6b20d9eac242ef5efdef7a39a999 From 9f6ad59d0be2055d3ee907949d6d8c1eb8ef2ea8 Mon Sep 17 00:00:00 2001 From: Ralf Peschke Date: Mon, 22 Feb 2021 11:42:47 +0100 Subject: [PATCH 3/3] PR5904 Fix permissions initial_data.jsoin and example-data.json --- docker/initial-data.json | 3 ++- docs/example-data.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docker/initial-data.json b/docker/initial-data.json index ed0408a86..76a2d5bc8 100644 --- a/docker/initial-data.json +++ b/docker/initial-data.json @@ -345,7 +345,8 @@ "motion.can_create_amendments", "motion.can_support", "projector.can_see", - "user.can_see" + "user.can_see", + "user.can_change_own_password" ], "user_ids": [], diff --git a/docs/example-data.json b/docs/example-data.json index 69609675f..9f57ccbe5 100644 --- a/docs/example-data.json +++ b/docs/example-data.json @@ -481,7 +481,8 @@ "motion.can_create_amendments", "motion.can_support", "projector.can_see", - "user.can_see" + "user.can_see", + "user.can_change_own_password" ], "user_ids": [],