Merge pull request #5790 from ostcar/models-changes

models.yml: More clear enums

docs/models.yml

@@ -38,7 +38,7 @@
 #     - on_delete: This fields determines what should happen with the foreign model if
 #       this model gets deleted. Possible values are:
 #           - SET_NULL (default): delete the id from the foreign key
-#           - PROTECT: if the foreign key is not empty, throw an error instead of 
+#           - PROTECT: if the foreign key is not empty, throw an error instead of
 #                      deleting the object
 #           - CASCADE: also delete all models in this foreign key
 # Structured fields:
@@ -393,11 +393,11 @@ meeting:
     - default_yes
     - default_no
   agenda_new_items_default_visibility:
-    type: number
+    type: string
     enum:
-    - 1
+    - common
-    - 2
+    - internal
-    - 3
+    - hidden
   agenda_show_internal_items_on_projector: boolean
 
   # List of speakers
@@ -474,7 +474,6 @@ meeting:
   motions_supporters_min_amount:
     type: number
     minimum: 0
-  motions_supporters_enable_autoremove: boolean
   motions_export_title: string
   motions_export_preamble: string
   motions_export_submitter_recommendation: boolean
@@ -723,9 +722,9 @@ meeting:
     type: relation
     to: group/default_group_for_meeting_id
     required: true
-  superadmin_group_id:
+  admin_group_id:
     type: relation
-    to: group/superadmin_group_for_meeting_id
+    to: group/admin_group_for_meeting_id
 
 group:
   id: number
@@ -741,9 +740,9 @@ group:
     type: relation
     to: meeting/default_group_id
     on_delete: PROTECT
-  superadmin_group_for_meeting_id:
+  admin_group_for_meeting_id:
     type: relation
-    to: meeting/superadmin_group_id
+    to: meeting/admin_group_id
     on_delete: PROTECT
   mediafile_access_group_ids:
     type: relation-list
@@ -827,12 +826,12 @@ agenda_item:
   comment: string
   closed: boolean
   type:
-    type: number
+    type: string
     enum:
-    - 1
+    - common
-    - 2
+    - internal
-    - 3
+    - hidden
-    default: 1
+    default: common
   duration:
     type: number
     description: Given in seconds
@@ -1288,13 +1287,13 @@ motion_change_recommendation:
   rejected: boolean
   internal: boolean
   type:
-    type: number
+    type: string
     enum:
-    - 0
+    - replacement
-    - 1
+    - insertion
-    - 2
+    - deletion
-    - 3
+    - other
-    default: 0
+    default: replacement
   other_description: string
   line_from:
     type: number
@@ -1325,20 +1324,20 @@ motion_state:
   recommendation_label: string
   css_class:
     type: string
-    default: lightblue
     enum:
     - grey
     - red
     - green
     - lightblue
     - yellow
+    default: lightblue
   restrictions:
     type: string[]
     items:
       enum:
-      - motions.can_see_internal
+      - motion.can_see_internal
-      - motions.can_manage_metadata
+      - motion.can_manage_metadata
-      - motions.can_manage
+      - motion.can_manage
       - is_submitter
   allow_support: boolean
   allow_create_poll: boolean
@@ -1346,12 +1345,12 @@ motion_state:
   set_number: boolean
   show_state_extension_field: boolean
   merge_amendment_into_final:
-    type: number
+    type: string
-    default: 0
     enum:
-    - -1
+    - do_not_merge
-    - 0
+    - undefined
-    - 1
+    - do_merge
+    default: undefined
   show_recommendation_extension_field: boolean
 
   next_state_ids:
@@ -1461,13 +1460,13 @@ poll:
       - YNA
       - N
   state:
-    type: number
+    type: string
-    default: 1
     enum:
-      - 1
+      - created
-      - 2
+      - started
-      - 3
+      - finished
-      - 4
+      - published
+    default: created
   min_votes_amount:
     type: number
     default: 1
@@ -1609,12 +1608,12 @@ assignment:
     minimum: 0
     default: 0
   phase:
-    type: number
+    type: string
     enum:
-    - 0
+    - search
-    - 1
+    - voting
-    - 2
+    - finished
-    default: 0
+    default: search
   default_poll_description: string
   number_poll_candidates: boolean