Fix topic poll create after meeting create (#3026)

OpenSlides · Nov 20, 2023 · 66b6859 · 66b6859
1 parent 9d64752
commit 66b6859
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/client/src/app/domain/models/users/group.ts b/client/src/app/domain/models/users/group.ts
@@ -28,6 +28,7 @@ export class Group extends BaseModel<Group> {
     public assignment_poll_ids!: Id[]; // (assignment_poll/entitled_group_ids)[];
     public used_as_motion_poll_default_id!: Id; // meeting/motion_poll_default_group_ids;
     public used_as_assignment_poll_default_id!: Id; // meeting/assignment_poll_default_group_ids;
+    public used_as_topic_poll_default_id!: Id; // meeting/topic_poll_default_group_ids;
 
     public get isAdminGroup(): boolean {
         return !!this.admin_group_for_meeting_id;
@@ -58,6 +59,7 @@ export class Group extends BaseModel<Group> {
         `write_chat_group_ids`,
         `used_as_motion_poll_default_id`,
         `used_as_assignment_poll_default_id`,
+        `used_as_topic_poll_default_id`,
         `meeting_id`
     ];
 }

diff --git a/client/src/app/infrastructure/definitions/relations/relations.ts b/client/src/app/infrastructure/definitions/relations/relations.ts
@@ -332,6 +332,12 @@ export const RELATIONS: Relation[] = [
         OField: `assignment_poll_default_groups`,
         MField: `used_as_assignment_poll_default`
     }),
+    ...makeM2O({
+        OViewModel: ViewMeeting,
+        MViewModel: ViewGroup,
+        OField: `topic_poll_default_groups`,
+        MField: `used_as_topic_poll_default`
+    }),
     ...makeM2O({
         OViewModel: ViewMeeting,
         MViewModel: ViewPointOfOrderCategory,

diff --git a/...es/meetings/pages/agenda/modules/topics/modules/topic-poll/services/topic-poll.service.ts b/...es/meetings/pages/agenda/modules/topics/modules/topic-poll/services/topic-poll.service.ts
@@ -38,7 +38,6 @@ export class TopicPollService extends PollService {
     public defaultPollMethod: PollMethod;
     public defaultPercentBase: PollPercentBase;
     public defaultGroupIds: number[];
-    public defaultPollType: PollType;
 
     public constructor(
         organizationSettingsService: OrganizationSettingsService,
@@ -64,10 +63,6 @@ export class TopicPollService extends PollService {
             .get(`poll_default_method`)
             .subscribe(method => (this.defaultPollMethod = method ?? PollMethod.Y));
 
-        this.meetingSettingsService
-            .get(`poll_default_type`)
-            .subscribe(type => (this.defaultPollType = type ?? PollType.Pseudoanonymous));
-
         this.meetingSettingsService.get(`poll_sort_poll_result_by_votes`).subscribe(sort => (this.sortByVote = sort));
     }
 
@@ -77,7 +72,7 @@ export class TopicPollService extends PollService {
             onehundred_percent_base: this.defaultPercentBase,
             entitled_group_ids: Object.values(this.defaultGroupIds ?? []),
             pollmethod: this.defaultPollMethod,
-            type: this.defaultPollType,
+            type: PollType.Pseudoanonymous,
             backend: PollBackendDurationType.FAST
         };
 

diff --git a/...t/src/app/site/pages/meetings/pages/participants/modules/groups/view-models/view-group.ts b/...t/src/app/site/pages/meetings/pages/participants/modules/groups/view-models/view-group.ts
@@ -35,5 +35,6 @@ interface IGroupRelations {
     polls: ViewPoll[];
     used_as_motion_poll_default?: ViewMeeting;
     used_as_assignment_poll_default?: ViewMeeting;
+    used_as_topic_poll_default?: ViewMeeting;
 }
 export interface ViewGroup extends Group, IGroupRelations, HasMeeting {}
diff --git a/client/src/app/site/pages/meetings/view-models/view-meeting.ts b/client/src/app/site/pages/meetings/view-models/view-meeting.ts
@@ -138,6 +138,7 @@ interface IMeetingRelations {
     motions_default_statute_amendment_workflow: ViewMotionWorkflow;
     motion_poll_default_groups: ViewGroup[];
     assignment_poll_default_groups: ViewGroup[];
+    topic_poll_default_groups: ViewGroup[];
     poll_default_groups: ViewGroup[];
     projectors: ViewProjector[];
     all_projections: ViewProjection[];