Fix motion list structure level (#2828)

OpenSlides · Sep 29, 2023 · d2a51bf · d2a51bf
1 parent 2c37153
commit d2a51bf
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 18 deletions.
diff --git a/client/src/app/domain/fieldsets/user.ts b/client/src/app/domain/fieldsets/user.ts
@@ -15,3 +15,9 @@ export class UserFieldsets {
         ]
     };
 }
+
+export class MeetingUserFieldsets {
+    public static readonly FullNameSubscription: BaseSimplifiedModelRequest = {
+        fieldset: [`group_ids`, `meeting_id`, `user_id`, `structure_level`, `number`]
+    };
+}
diff --git a/client/src/app/gateways/repositories/meeting_user/meeting-user-repository.service.ts b/client/src/app/gateways/repositories/meeting_user/meeting-user-repository.service.ts
@@ -27,10 +27,10 @@ export class MeetingUserRepositoryService extends BaseMeetingRelatedRepository<V
             `vote_delegated_to_id`,
             `vote_delegations_from_ids`,
             `vote_weight`,
-            `structure_level`,
-            `number`,
             `comment`,
-            `user_id`
+            `user_id`,
+            `structure_level`,
+            `number`
         ]);
 
         const detailFields: TypedFieldset<MeetingUser> = [`about_me`, `user_id`, `meeting_id`];

diff --git a/client/src/app/site/pages/meetings/pages/agenda/agenda.subscription.ts b/client/src/app/site/pages/meetings/pages/agenda/agenda.subscription.ts
@@ -1,6 +1,6 @@
 import { Id } from 'src/app/domain/definitions/key-types';
 import { FULL_FIELDSET, MEETING_ROUTING_FIELDS } from 'src/app/domain/fieldsets/misc';
-import { UserFieldsets } from 'src/app/domain/fieldsets/user';
+import { MeetingUserFieldsets, UserFieldsets } from 'src/app/domain/fieldsets/user';
 import { SubscriptionConfigGenerator } from 'src/app/domain/interfaces/subscription-config';
 import { ViewMeeting } from 'src/app/site/pages/meetings/view-models/view-meeting';
 import { FollowList } from 'src/app/site/services/model-request-builder';
@@ -21,13 +21,13 @@ export const agendaItemFollow: FollowList<any> = [
                 follow: [
                     {
                         idField: `meeting_user_id`,
-                        fieldset: [],
                         follow: [
                             {
                                 idField: `user_id`,
-                                ...UserFieldsets.FullNameSubscription
+                                fieldset: [...UserFieldsets.FullNameSubscription.fieldset, `meeting_user_ids`]
                             }
-                        ]
+                        ],
+                        ...MeetingUserFieldsets.FullNameSubscription
                     },
                     {
                         idField: `point_of_order_category_id`,

diff --git a/client/src/app/site/pages/meetings/pages/assignments/assignments.subscription.ts b/client/src/app/site/pages/meetings/pages/assignments/assignments.subscription.ts
@@ -1,5 +1,5 @@
 import { Id } from 'src/app/domain/definitions/key-types';
-import { UserFieldsets } from 'src/app/domain/fieldsets/user';
+import { MeetingUserFieldsets, UserFieldsets } from 'src/app/domain/fieldsets/user';
 import { SubscriptionConfigGenerator } from 'src/app/domain/interfaces/subscription-config';
 import { ViewMeeting } from 'src/app/site/pages/meetings/view-models/view-meeting';
 
@@ -25,13 +25,13 @@ export const getAssignmentSubscriptionConfig: SubscriptionConfigGenerator = (id:
                 follow: [
                     {
                         idField: `meeting_user_id`,
-                        fieldset: [],
                         follow: [
                             {
                                 idField: `user_id`,
-                                ...UserFieldsets.FullNameSubscription
+                                fieldset: [...UserFieldsets.FullNameSubscription.fieldset, `meeting_user_ids`]
                             }
-                        ]
+                        ],
+                        ...MeetingUserFieldsets.FullNameSubscription
                     }
                 ]
             }

diff --git a/client/src/app/site/pages/meetings/pages/autopilot/autopilot.subscription.ts b/client/src/app/site/pages/meetings/pages/autopilot/autopilot.subscription.ts
@@ -1,6 +1,6 @@
 import { Id } from 'src/app/domain/definitions/key-types';
 import { FULL_FIELDSET, MEETING_ROUTING_FIELDS } from 'src/app/domain/fieldsets/misc';
-import { UserFieldsets } from 'src/app/domain/fieldsets/user';
+import { MeetingUserFieldsets, UserFieldsets } from 'src/app/domain/fieldsets/user';
 import { SubscriptionConfig, SubscriptionConfigGenerator } from 'src/app/domain/interfaces/subscription-config';
 import { ViewMeeting } from 'src/app/site/pages/meetings/view-models/view-meeting';
 
@@ -59,13 +59,16 @@ export const getAutopilotContentSubscriptionConfig = (id: Id): SubscriptionConfi
                                 follow: [
                                     {
                                         idField: `meeting_user_id`,
-                                        fieldset: [],
                                         follow: [
                                             {
                                                 idField: `user_id`,
-                                                ...UserFieldsets.FullNameSubscription
+                                                fieldset: [
+                                                    ...UserFieldsets.FullNameSubscription.fieldset,
+                                                    `meeting_user_ids`
+                                                ]
                                             }
-                                        ]
+                                        ],
+                                        ...MeetingUserFieldsets.FullNameSubscription
                                     }
                                 ]
                             }

diff --git a/client/src/app/site/pages/meetings/pages/motions/motions.subscription.ts b/client/src/app/site/pages/meetings/pages/motions/motions.subscription.ts
@@ -1,6 +1,6 @@
 import { Id } from 'src/app/domain/definitions/key-types';
 import { FULL_FIELDSET } from 'src/app/domain/fieldsets/misc';
-import { UserFieldsets } from 'src/app/domain/fieldsets/user';
+import { MeetingUserFieldsets, UserFieldsets } from 'src/app/domain/fieldsets/user';
 import { SubscriptionConfigGenerator } from 'src/app/domain/interfaces/subscription-config';
 import { ViewMeeting } from 'src/app/site/pages/meetings/view-models/view-meeting';
 
@@ -67,7 +67,13 @@ export const getMotionListSubscriptionConfig: SubscriptionConfigGenerator = (id:
                         follow: [
                             {
                                 idField: `meeting_user_id`,
-                                follow: [{ idField: `user_id`, ...UserFieldsets.FullNameSubscription }]
+                                follow: [
+                                    {
+                                        idField: `user_id`,
+                                        fieldset: [...UserFieldsets.FullNameSubscription.fieldset, `meeting_user_ids`]
+                                    }
+                                ],
+                                ...MeetingUserFieldsets.FullNameSubscription
                             }
                         ]
                     }
@@ -183,7 +189,13 @@ export const getMotionDetailSubscriptionConfig: SubscriptionConfigGenerator = (.
             { idField: `comment_ids`, fieldset: FULL_FIELDSET },
             {
                 idField: `supporter_meeting_user_ids`,
-                follow: [{ idField: `user_id`, ...UserFieldsets.FullNameSubscription }]
+                follow: [
+                    {
+                        idField: `user_id`,
+                        fieldset: [...UserFieldsets.FullNameSubscription.fieldset, `meeting_user_ids`]
+                    }
+                ],
+                ...MeetingUserFieldsets.FullNameSubscription
             }
         ],
         fieldset: [