From 1fe6e4e58e47746ffc035c9ff886820272afe682 Mon Sep 17 00:00:00 2001 From: Ralf Peschke Date: Mon, 20 Sep 2021 16:48:43 +0200 Subject: [PATCH 1/3] New field motion_state/dont_set_identifier (Backend #939) --- docker/initial-data.json | 267 +++++++++++++++++++++++++++++++++++++-- docs/example-data.json | 181 +++++++++++++------------- docs/models.yml | 4 + 3 files changed, 349 insertions(+), 103 deletions(-) diff --git a/docker/initial-data.json b/docker/initial-data.json index c73e06de0..b10fa676b 100644 --- a/docker/initial-data.json +++ b/docker/initial-data.json @@ -246,19 +246,12 @@ "motion_comment_section_ids": [], "motion_category_ids": [], "motion_block_ids": [], - "motion_workflow_ids": [ - 1 - ], + "motion_workflow_ids": [1, 2], "motion_statute_paragraph_ids": [], "motion_comment_ids": [], "motion_submitter_ids": [], "motion_change_recommendation_ids": [], - "motion_state_ids": [ - 1, - 2, - 3, - 4 - ], + "motion_state_ids": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15], "poll_ids": [], "option_ids": [], "vote_ids": [], @@ -471,6 +464,7 @@ "allow_support": true, "allow_create_poll": true, "allow_submitter_edit": true, + "dont_set_identifier": false, "set_number": true, "show_state_extension_field": false, "merge_amendment_into_final": "undefined", @@ -496,6 +490,7 @@ "allow_support": false, "allow_create_poll": false, "allow_submitter_edit": false, + "dont_set_identifier": false, "set_number": true, "show_state_extension_field": false, "merge_amendment_into_final": "undefined", @@ -519,6 +514,7 @@ "allow_support": false, "allow_create_poll": false, "allow_submitter_edit": false, + "dont_set_identifier": false, "set_number": true, "show_state_extension_field": false, "merge_amendment_into_final": "undefined", @@ -542,6 +538,7 @@ "allow_support": false, "allow_create_poll": false, "allow_submitter_edit": false, + "dont_set_identifier": false, "set_number": true, "show_state_extension_field": false, "merge_amendment_into_final": "undefined", @@ -555,6 +552,248 @@ "workflow_id": 1, "first_state_of_workflow_id": null, "meeting_id": 1 + }, + "5": { + "id": 5, + "name": "in_progress", + "recommendation_label": null, + "css_class": "lightblue", + "restrictions": [], + "allow_support": false, + "allow_create_poll": false, + "allow_submitter_edit": true, + "dont_set_identifier": true, + "set_number": true, + "show_state_extension_field": false, + "merge_amendment_into_final": "undefined", + "show_recommendation_extension_field": false, + "next_state_ids": [6, 10], + "previous_state_ids": [], + "motion_ids": [], + "motion_recommendation_ids": [], + "workflow_id": 2, + "first_state_of_workflow_id": 2, + "meeting_id": 1 + }, + "6": { + "id": 6, + "name": "submitted", + "recommendation_label": null, + "css_class": "lightblue", + "restrictions": [], + "allow_support": true, + "allow_create_poll": false, + "allow_submitter_edit": false, + "dont_set_identifier": true, + "set_number": true, + "show_state_extension_field": false, + "merge_amendment_into_final": "undefined", + "show_recommendation_extension_field": false, + "next_state_ids": [7, 10, 15], + "previous_state_ids": [5], + "motion_ids": [], + "motion_recommendation_ids": [], + "workflow_id": 2, + "first_state_of_workflow_id": null, + "meeting_id": 1 + }, + "7": { + "id": 7, + "name": "permitted", + "recommendation_label": "Permission", + "css_class": "lightblue", + "restrictions": [], + "allow_support": false, + "allow_create_poll": true, + "allow_submitter_edit": false, + "dont_set_identifier": false, + "set_number": true, + "show_state_extension_field": false, + "merge_amendment_into_final": "undefined", + "show_recommendation_extension_field": false, + "next_state_ids": [8, 9, 10, 11, 12, 13, 14], + "previous_state_ids": [6], + "motion_ids": [], + "motion_recommendation_ids": [], + "workflow_id": 2, + "first_state_of_workflow_id": null, + "meeting_id": 1 + }, + "8": { + "id": 8, + "name": "accepted", + "recommendation_label": "Acceptance", + "css_class": "green", + "restrictions": [], + "allow_support": false, + "allow_create_poll": false, + "allow_submitter_edit": false, + "dont_set_identifier": false, + "set_number": true, + "show_state_extension_field": false, + "merge_amendment_into_final": "do_merge", + "show_recommendation_extension_field": false, + "next_state_ids": [], + "previous_state_ids": [7], + "motion_ids": [], + "motion_recommendation_ids": [], + "workflow_id": 2, + "first_state_of_workflow_id": null, + "meeting_id": 1 + }, + "9": { + "id": 9, + "name": "rejected", + "recommendation_label": "Rejection", + "css_class": "red", + "restrictions": [], + "allow_support": false, + "allow_create_poll": false, + "allow_submitter_edit": false, + "dont_set_identifier": false, + "set_number": true, + "show_state_extension_field": false, + "merge_amendment_into_final": "do_not_merge", + "show_recommendation_extension_field": false, + "next_state_ids": [], + "previous_state_ids": [7], + "motion_ids": [], + "motion_recommendation_ids": [], + "workflow_id": 2, + "first_state_of_workflow_id": null, + "meeting_id": 1 + }, + "10": { + "id": 10, + "name": "withdrawed", + "recommendation_label": null, + "css_class": "grey", + "restrictions": [], + "allow_support": false, + "allow_create_poll": false, + "allow_submitter_edit": false, + "dont_set_identifier": false, + "set_number": true, + "show_state_extension_field": false, + "merge_amendment_into_final": "do_not_merge", + "show_recommendation_extension_field": false, + "next_state_ids": [], + "previous_state_ids": [5, 6, 7], + "motion_ids": [], + "motion_recommendation_ids": [], + "workflow_id": 2, + "first_state_of_workflow_id": null, + "meeting_id": 1 + }, + "11": { + "id": 11, + "name": "adjourned", + "recommendation_label": "Adjournment", + "css_class": "grey", + "restrictions": [], + "allow_support": false, + "allow_create_poll": false, + "allow_submitter_edit": false, + "dont_set_identifier": false, + "set_number": true, + "show_state_extension_field": false, + "merge_amendment_into_final": "do_not_merge", + "show_recommendation_extension_field": false, + "next_state_ids": [], + "previous_state_ids": [7], + "motion_ids": [], + "motion_recommendation_ids": [], + "workflow_id": 2, + "first_state_of_workflow_id": null, + "meeting_id": 1 + }, + "12": { + "id": 12, + "name": "not concerned", + "recommendation_label": "No concernment", + "css_class": "grey", + "restrictions": [], + "allow_support": false, + "allow_create_poll": false, + "allow_submitter_edit": false, + "dont_set_identifier": false, + "set_number": true, + "show_state_extension_field": false, + "merge_amendment_into_final": "do_not_merge", + "show_recommendation_extension_field": false, + "next_state_ids": [], + "previous_state_ids": [7], + "motion_ids": [], + "motion_recommendation_ids": [], + "workflow_id": 2, + "first_state_of_workflow_id": null, + "meeting_id": 1 + }, + "13": { + "id": 13, + "name": "refered to committee", + "recommendation_label": "Referral to committee", + "css_class": "grey", + "restrictions": [], + "allow_support": false, + "allow_create_poll": false, + "allow_submitter_edit": false, + "dont_set_identifier": false, + "set_number": true, + "show_state_extension_field": false, + "merge_amendment_into_final": "do_not_merge", + "show_recommendation_extension_field": false, + "next_state_ids": [], + "previous_state_ids": [7], + "motion_ids": [], + "motion_recommendation_ids": [], + "workflow_id": 2, + "first_state_of_workflow_id": null, + "meeting_id": 1 + }, + "14": { + "id": 14, + "name": "needs review", + "recommendation_label": null, + "css_class": "grey", + "restrictions": [], + "allow_support": false, + "allow_create_poll": false, + "allow_submitter_edit": false, + "dont_set_identifier": false, + "set_number": true, + "show_state_extension_field": false, + "merge_amendment_into_final": "do_not_merge", + "show_recommendation_extension_field": false, + "next_state_ids": [], + "previous_state_ids": [7], + "motion_ids": [], + "motion_recommendation_ids": [], + "workflow_id": 2, + "first_state_of_workflow_id": null, + "meeting_id": 1 + }, + "15": { + "id": 15, + "name": "rejected (not authorized)", + "recommendation_label": "Rejection (not authorized)", + "css_class": "grey", + "restrictions": [], + "allow_support": false, + "allow_create_poll": false, + "allow_submitter_edit": false, + "dont_set_identifier": false, + "set_number": true, + "show_state_extension_field": false, + "merge_amendment_into_final": "do_not_merge", + "show_recommendation_extension_field": false, + "next_state_ids": [], + "previous_state_ids": [6], + "motion_ids": [], + "motion_recommendation_ids": [], + "workflow_id": 2, + "first_state_of_workflow_id": null, + "meeting_id": 1 } }, "motion_workflow": { @@ -572,6 +811,16 @@ "default_amendment_workflow_meeting_id": 1, "default_statute_amendment_workflow_meeting_id": 1, "meeting_id": 1 + }, + "2": { + "id": 2, + "name": "Complex Workflow", + "state_ids": [5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15], + "first_state_id": 5, + "default_workflow_meeting_id": null, + "default_amendment_workflow_meeting_id": null, + "default_statute_amendment_workflow_meeting_id": null, + "meeting_id": 1 } }, "motion_statute_paragraph": {}, diff --git a/docs/example-data.json b/docs/example-data.json index 71fedf587..b5fb3fb49 100644 --- a/docs/example-data.json +++ b/docs/example-data.json @@ -631,7 +631,8 @@ 11, 12, 13, - 14 + 14, + 15 ], "motion_category_ids": [ 1, @@ -1869,7 +1870,7 @@ "derived_motion_ids": [], "all_origin_ids": [], "all_derived_motion_ids": [], - "state_id": 6, + "state_id": 7, "recommendation_id": null, "category_id": null, "block_id": 1, @@ -2041,6 +2042,7 @@ "allow_support": true, "allow_create_poll": true, "allow_submitter_edit": true, + "dont_set_identifier": false, "set_number": true, "show_state_extension_field": false, "merge_amendment_into_final": "undefined", @@ -2070,6 +2072,7 @@ "allow_support": false, "allow_create_poll": false, "allow_submitter_edit": false, + "dont_set_identifier": false, "set_number": true, "show_state_extension_field": false, "merge_amendment_into_final": "undefined", @@ -2093,6 +2096,7 @@ "allow_support": false, "allow_create_poll": false, "allow_submitter_edit": false, + "dont_set_identifier": false, "set_number": true, "show_state_extension_field": false, "merge_amendment_into_final": "undefined", @@ -2116,6 +2120,7 @@ "allow_support": false, "allow_create_poll": false, "allow_submitter_edit": false, + "dont_set_identifier": false, "set_number": true, "show_state_extension_field": false, "merge_amendment_into_final": "undefined", @@ -2132,22 +2137,19 @@ }, "5": { "id": 5, - "name": "published", + "name": "in_progress", "recommendation_label": null, "css_class": "lightblue", "restrictions": [], - "allow_support": true, + "allow_support": false, "allow_create_poll": false, "allow_submitter_edit": true, - "set_number": false, + "dont_set_identifier": true, + "set_number": true, "show_state_extension_field": false, "merge_amendment_into_final": "undefined", "show_recommendation_extension_field": false, - "next_state_ids": [ - 6, - 9, - 14 - ], + "next_state_ids": [6, 10], "previous_state_ids": [], "motion_ids": [], "motion_recommendation_ids": [], @@ -2157,32 +2159,21 @@ }, "6": { "id": 6, - "name": "permitted", - "recommendation_label": "Permission", + "name": "submitted", + "recommendation_label": null, "css_class": "lightblue", "restrictions": [], - "allow_support": false, - "allow_create_poll": true, - "allow_submitter_edit": true, + "allow_support": true, + "allow_create_poll": false, + "allow_submitter_edit": false, + "dont_set_identifier": true, "set_number": true, "show_state_extension_field": false, "merge_amendment_into_final": "undefined", "show_recommendation_extension_field": false, - "next_state_ids": [ - 7, - 8, - 9, - 10, - 11, - 12, - 13 - ], - "previous_state_ids": [ - 5 - ], - "motion_ids": [ - 4 - ], + "next_state_ids": [7, 10, 15], + "previous_state_ids": [5], + "motion_ids": [], "motion_recommendation_ids": [], "workflow_id": 2, "first_state_of_workflow_id": null, @@ -2190,22 +2181,21 @@ }, "7": { "id": 7, - "name": "accepted", - "recommendation_label": "Acceptance", - "css_class": "green", + "name": "permitted", + "recommendation_label": "Permission", + "css_class": "lightblue", "restrictions": [], "allow_support": false, - "allow_create_poll": false, + "allow_create_poll": true, "allow_submitter_edit": false, + "dont_set_identifier": false, "set_number": true, "show_state_extension_field": false, "merge_amendment_into_final": "undefined", "show_recommendation_extension_field": false, - "next_state_ids": [], - "previous_state_ids": [ - 6 - ], - "motion_ids": [], + "next_state_ids": [8, 9, 10, 11, 12, 13, 14], + "previous_state_ids": [6], + "motion_ids": [4], "motion_recommendation_ids": [], "workflow_id": 2, "first_state_of_workflow_id": null, @@ -2213,21 +2203,20 @@ }, "8": { "id": 8, - "name": "rejected", - "recommendation_label": "Rejection", - "css_class": "red", + "name": "accepted", + "recommendation_label": "Acceptance", + "css_class": "green", "restrictions": [], "allow_support": false, "allow_create_poll": false, "allow_submitter_edit": false, + "dont_set_identifier": false, "set_number": true, "show_state_extension_field": false, - "merge_amendment_into_final": "undefined", + "merge_amendment_into_final": "do_merge", "show_recommendation_extension_field": false, "next_state_ids": [], - "previous_state_ids": [ - 6 - ], + "previous_state_ids": [7], "motion_ids": [], "motion_recommendation_ids": [], "workflow_id": 2, @@ -2236,22 +2225,20 @@ }, "9": { "id": 9, - "name": "withdrawed", - "recommendation_label": null, - "css_class": "grey", + "name": "rejected", + "recommendation_label": "Rejection", + "css_class": "red", "restrictions": [], "allow_support": false, "allow_create_poll": false, "allow_submitter_edit": false, + "dont_set_identifier": false, "set_number": true, "show_state_extension_field": false, - "merge_amendment_into_final": "undefined", + "merge_amendment_into_final": "do_not_merge", "show_recommendation_extension_field": false, "next_state_ids": [], - "previous_state_ids": [ - 5, - 6 - ], + "previous_state_ids": [7], "motion_ids": [], "motion_recommendation_ids": [], "workflow_id": 2, @@ -2260,21 +2247,20 @@ }, "10": { "id": 10, - "name": "adjourned", - "recommendation_label": "Adjournment", + "name": "withdrawed", + "recommendation_label": null, "css_class": "grey", "restrictions": [], "allow_support": false, "allow_create_poll": false, "allow_submitter_edit": false, + "dont_set_identifier": false, "set_number": true, "show_state_extension_field": false, - "merge_amendment_into_final": "undefined", + "merge_amendment_into_final": "do_not_merge", "show_recommendation_extension_field": false, "next_state_ids": [], - "previous_state_ids": [ - 6 - ], + "previous_state_ids": [5, 6, 7], "motion_ids": [], "motion_recommendation_ids": [], "workflow_id": 2, @@ -2283,21 +2269,20 @@ }, "11": { "id": 11, - "name": "not concerned", - "recommendation_label": "No concernment", + "name": "adjourned", + "recommendation_label": "Adjournment", "css_class": "grey", "restrictions": [], "allow_support": false, "allow_create_poll": false, "allow_submitter_edit": false, + "dont_set_identifier": false, "set_number": true, "show_state_extension_field": false, - "merge_amendment_into_final": "undefined", + "merge_amendment_into_final": "do_not_merge", "show_recommendation_extension_field": false, "next_state_ids": [], - "previous_state_ids": [ - 6 - ], + "previous_state_ids": [7], "motion_ids": [], "motion_recommendation_ids": [], "workflow_id": 2, @@ -2306,21 +2291,20 @@ }, "12": { "id": 12, - "name": "refered to committee", - "recommendation_label": "Referral to committee", + "name": "not concerned", + "recommendation_label": "No concernment", "css_class": "grey", "restrictions": [], "allow_support": false, "allow_create_poll": false, "allow_submitter_edit": false, + "dont_set_identifier": false, "set_number": true, "show_state_extension_field": false, - "merge_amendment_into_final": "undefined", + "merge_amendment_into_final": "do_not_merge", "show_recommendation_extension_field": false, "next_state_ids": [], - "previous_state_ids": [ - 6 - ], + "previous_state_ids": [7], "motion_ids": [], "motion_recommendation_ids": [], "workflow_id": 2, @@ -2329,21 +2313,20 @@ }, "13": { "id": 13, - "name": "needs review", - "recommendation_label": null, + "name": "refered to committee", + "recommendation_label": "Referral to committee", "css_class": "grey", "restrictions": [], "allow_support": false, "allow_create_poll": false, "allow_submitter_edit": false, + "dont_set_identifier": false, "set_number": true, "show_state_extension_field": false, - "merge_amendment_into_final": "undefined", + "merge_amendment_into_final": "do_not_merge", "show_recommendation_extension_field": false, "next_state_ids": [], - "previous_state_ids": [ - 6 - ], + "previous_state_ids": [7], "motion_ids": [], "motion_recommendation_ids": [], "workflow_id": 2, @@ -2352,6 +2335,28 @@ }, "14": { "id": 14, + "name": "needs review", + "recommendation_label": null, + "css_class": "grey", + "restrictions": [], + "allow_support": false, + "allow_create_poll": false, + "allow_submitter_edit": false, + "dont_set_identifier": false, + "set_number": true, + "show_state_extension_field": false, + "merge_amendment_into_final": "do_not_merge", + "show_recommendation_extension_field": false, + "next_state_ids": [], + "previous_state_ids": [7], + "motion_ids": [], + "motion_recommendation_ids": [], + "workflow_id": 2, + "first_state_of_workflow_id": null, + "meeting_id": 1 + }, + "15": { + "id": 15, "name": "rejected (not authorized)", "recommendation_label": "Rejection (not authorized)", "css_class": "grey", @@ -2359,14 +2364,13 @@ "allow_support": false, "allow_create_poll": false, "allow_submitter_edit": false, + "dont_set_identifier": false, "set_number": true, "show_state_extension_field": false, - "merge_amendment_into_final": "undefined", + "merge_amendment_into_final": "do_not_merge", "show_recommendation_extension_field": false, "next_state_ids": [], - "previous_state_ids": [ - 5 - ], + "previous_state_ids": [6], "motion_ids": [], "motion_recommendation_ids": [], "workflow_id": 2, @@ -2393,18 +2397,7 @@ "2": { "id": 2, "name": "Complex Workflow", - "state_ids": [ - 5, - 6, - 7, - 8, - 9, - 10, - 11, - 12, - 13, - 14 - ], + "state_ids": [5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15], "first_state_id": 5, "default_workflow_meeting_id": null, "default_amendment_workflow_meeting_id": null, diff --git a/docs/models.yml b/docs/models.yml index fe47e8210..b7c0e3416 100644 --- a/docs/models.yml +++ b/docs/models.yml @@ -2155,6 +2155,10 @@ motion_state: type: boolean default: false restriction_mode: A + dont_set_identifier: + type: boolean + default: false + restriction_mode: A set_number: type: boolean default: true From 761c248e193d4b10053565a06d7d13766825b221 Mon Sep 17 00:00:00 2001 From: Ralf Peschke Date: Tue, 21 Sep 2021 09:29:36 +0200 Subject: [PATCH 2/3] Changed hash for initial_data.json --- .github/workflows/md5_check_initial-data.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/md5_check_initial-data.yml b/.github/workflows/md5_check_initial-data.yml index 61fbf6415..7faefc07c 100644 --- a/.github/workflows/md5_check_initial-data.yml +++ b/.github/workflows/md5_check_initial-data.yml @@ -21,4 +21,4 @@ jobs: run: md5sum docker/initial-data.json - name: Validate and protect initial-data.json - run: echo "9ca46e90001774eb43280ff4a8f9e9b2 docker/initial-data.json" | md5sum -c - + run: echo "49f20259e8a52cf1198e98027671010a docker/initial-data.json" | md5sum -c - From 0e830e677b193fa4b326495a1a16612ee9449e64 Mon Sep 17 00:00:00 2001 From: Ralf Peschke Date: Thu, 23 Sep 2021 14:09:02 +0200 Subject: [PATCH 3/3] Initia-dat.json plus workflow and new backend submodule --- .github/workflows/md5_check_initial-data.yml | 2 +- docker/initial-data.json | 2 +- openslides-backend | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/md5_check_initial-data.yml b/.github/workflows/md5_check_initial-data.yml index 7faefc07c..bbb205bf0 100644 --- a/.github/workflows/md5_check_initial-data.yml +++ b/.github/workflows/md5_check_initial-data.yml @@ -21,4 +21,4 @@ jobs: run: md5sum docker/initial-data.json - name: Validate and protect initial-data.json - run: echo "49f20259e8a52cf1198e98027671010a docker/initial-data.json" | md5sum -c - + run: echo "f0ecac91d4167ceb78f0b524f2c9dd88 docker/initial-data.json" | md5sum -c - diff --git a/docker/initial-data.json b/docker/initial-data.json index b10fa676b..b60584a88 100644 --- a/docker/initial-data.json +++ b/docker/initial-data.json @@ -1,5 +1,5 @@ { - "_migration_index": 3, + "_migration_index": 4, "organization": { "1": { "id": 1, diff --git a/openslides-backend b/openslides-backend index a3b2fac70..813343a81 160000 --- a/openslides-backend +++ b/openslides-backend @@ -1 +1 @@ -Subproject commit a3b2fac70508bf116ca4fff4a9745ab197edac7c +Subproject commit 813343a8109c36e1482c8bcf20abf16ee7dcd4f9