diff --git a/client/src/app/gateways/repositories/agenda/functions.ts b/client/src/app/gateways/repositories/agenda/functions.ts index dcbad83959..b1ea032ca5 100644 --- a/client/src/app/gateways/repositories/agenda/functions.ts +++ b/client/src/app/gateways/repositories/agenda/functions.ts @@ -12,6 +12,7 @@ export function createAgendaItem(model: any): any { agenda_duration: parseInt(model.agenda_duration, 10) || undefined, agenda_parent_id: model.agenda_parent_id, agenda_type: model.agenda_type, - agenda_weight: model.agenda_weight + agenda_weight: model.agenda_weight, + agenda_tag_ids: model.tag_ids }; } diff --git a/client/src/app/gateways/repositories/topics/topic-repository.service.ts b/client/src/app/gateways/repositories/topics/topic-repository.service.ts index 1aad58b00c..52ff4bd246 100644 --- a/client/src/app/gateways/repositories/topics/topic-repository.service.ts +++ b/client/src/app/gateways/repositories/topics/topic-repository.service.ts @@ -68,7 +68,8 @@ export class TopicRepositoryService extends BaseAgendaItemAndListOfSpeakersConte agenda_parent_id: topicAgendaItem.parent_id, agenda_weight: topicAgendaItem.weight, agenda_comment: topicAgendaItem.comment, - agenda_duration: topicAgendaItem.duration + agenda_duration: topicAgendaItem.duration, + tag_ids: topicAgendaItem.tag_ids }; } diff --git a/client/src/app/site/pages/meetings/pages/agenda/pages/agenda-item-list/components/agenda-item-list/agenda-item-list.component.ts b/client/src/app/site/pages/meetings/pages/agenda/pages/agenda-item-list/components/agenda-item-list/agenda-item-list.component.ts index e86d92b1a0..d357af98bb 100644 --- a/client/src/app/site/pages/meetings/pages/agenda/pages/agenda-item-list/components/agenda-item-list/agenda-item-list.component.ts +++ b/client/src/app/site/pages/meetings/pages/agenda/pages/agenda-item-list/components/agenda-item-list/agenda-item-list.component.ts @@ -398,7 +398,7 @@ export class AgendaItemListComponent extends BaseMeetingListViewComponent el.content_object.id))) .then(() => { - this.topicRepo.duplicateTopics(...filteredItems); + this.topicRepo.duplicateTopics(...filteredItems.map(item => this.repo.getViewModel(item.id))); }); } diff --git a/client/src/app/site/pages/meetings/pages/assignments/pages/assignment-detail/components/assignment-detail/assignment-detail.component.ts b/client/src/app/site/pages/meetings/pages/assignments/pages/assignment-detail/components/assignment-detail/assignment-detail.component.ts index 0595354e43..7999e57acb 100644 --- a/client/src/app/site/pages/meetings/pages/assignments/pages/assignment-detail/components/assignment-detail/assignment-detail.component.ts +++ b/client/src/app/site/pages/meetings/pages/assignments/pages/assignment-detail/components/assignment-detail/assignment-detail.component.ts @@ -374,7 +374,8 @@ export class AssignmentDetailComponent extends BaseMeetingComponent implements O */ public async onDeleteAssignmentButton(): Promise { const title = this.translate.instant(`Are you sure you want to delete this election?`); - if (await this.promptService.open(title, this.assignment.getTitle())) { + const content = this.assignment.getTitle(); + if (await this.promptService.open(title, content)) { this.assignmentRepo .delete(this.assignment) .then(() => this.router.navigate([this.activeMeetingId, `assignments`])); diff --git a/client/src/app/site/pages/meetings/pages/chat/pages/chat-group-list/components/chat-group-detail/chat-group-detail.component.ts b/client/src/app/site/pages/meetings/pages/chat/pages/chat-group-list/components/chat-group-detail/chat-group-detail.component.ts index c0288ceefd..1f442eb4c3 100644 --- a/client/src/app/site/pages/meetings/pages/chat/pages/chat-group-list/components/chat-group-detail/chat-group-detail.component.ts +++ b/client/src/app/site/pages/meetings/pages/chat/pages/chat-group-list/components/chat-group-detail/chat-group-detail.component.ts @@ -134,7 +134,8 @@ export class ChatGroupDetailComponent extends BaseMeetingComponent implements On public async clearChatGroup(chatGroup: ViewChatGroup): Promise { const title = this.translate.instant(`Are you sure you want to clear all messages in this chat?`); - if (await this.promptService.open(title, chatGroup.name)) { + const content = chatGroup.name; + if (await this.promptService.open(title, content)) { await this.repo.clear(chatGroup).catch(this.raiseError); this.triggerUpdateView(); } diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/workflows/components/workflow-detail/workflow-detail.component.ts b/client/src/app/site/pages/meetings/pages/motions/pages/workflows/components/workflow-detail/workflow-detail.component.ts index 83fba103f1..8b10466a38 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/workflows/components/workflow-detail/workflow-detail.component.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/workflows/components/workflow-detail/workflow-detail.component.ts @@ -534,14 +534,13 @@ Note: Does not affect the visibility of change recommendations.` return (state)[perm.selector]; } - private deleteWorkflowState(state: ViewMotionState): void { - const content = this.translate.instant(`Delete`) + ` ${state.name}?`; + private async deleteWorkflowState(state: ViewMotionState): Promise { + const title = this.translate.instant(`Are you sure you want to delete this state?`); + const content = `${state.name}`; - this.promptService.open(`Are you sure`, content).then(promptResult => { - if (promptResult) { - this.handleRequest(this.stateRepo.delete(state)); - } - }); + if (await this.promptService.open(title, content)) { + this.handleRequest(this.stateRepo.delete(state)); + } } private updateWorkflowStateName(name: string, state: ViewMotionState): void { diff --git a/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/components/projector-detail/projector-detail.component.ts b/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/components/projector-detail/projector-detail.component.ts index d789702892..4706340060 100644 --- a/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/components/projector-detail/projector-detail.component.ts +++ b/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/components/projector-detail/projector-detail.component.ts @@ -165,7 +165,8 @@ export class ProjectorDetailComponent extends BaseMeetingComponent implements On */ public async onDeleteProjectorButton(): Promise { const title = this.translate.instant(`Are you sure you want to delete this projector?`); - if (this.projector && (await this.promptService.open(title, this.projector.name))) { + const content = this.projector.name; + if (this.projector && (await this.promptService.open(title, content))) { this.repo.delete(this.projector); } } diff --git a/client/src/app/site/pages/meetings/pages/projectors/modules/projector-list/components/projector-list-entry/projector-list-entry.component.ts b/client/src/app/site/pages/meetings/pages/projectors/modules/projector-list/components/projector-list-entry/projector-list-entry.component.ts index cd505f0172..fea023267b 100644 --- a/client/src/app/site/pages/meetings/pages/projectors/modules/projector-list/components/projector-list-entry/projector-list-entry.component.ts +++ b/client/src/app/site/pages/meetings/pages/projectors/modules/projector-list/components/projector-list-entry/projector-list-entry.component.ts @@ -105,7 +105,8 @@ export class ProjectorListEntryComponent { */ public async onDeleteButton(): Promise { const title = this.translate.instant(`Are you sure you want to delete this projector?`); - if (await this.promptService.open(title, this.projector.name)) { + const content = this.projector.name; + if (await this.promptService.open(title, content)) { this.repo.delete(this.projector); } } diff --git a/client/src/app/site/pages/organization/pages/organization-tags/pages/organization-tag-list/components/organization-tag-list/organization-tag-list.component.ts b/client/src/app/site/pages/organization/pages/organization-tags/pages/organization-tag-list/components/organization-tag-list/organization-tag-list.component.ts index a81d4cdc08..18a57c77d0 100644 --- a/client/src/app/site/pages/organization/pages/organization-tags/pages/organization-tag-list/components/organization-tag-list/organization-tag-list.component.ts +++ b/client/src/app/site/pages/organization/pages/organization-tags/pages/organization-tag-list/components/organization-tag-list/organization-tag-list.component.ts @@ -53,12 +53,12 @@ export class OrganizationTagListComponent extends BaseListViewComponent { - const dialogTitle = + const title = orgaTags.length === 1 ? this.translate.instant(`Are you sure you want to delete this tag?`) : this.translate.instant(`Are you sure you want to delete all selected tags?`); - const dialogSubtitle = orgaTags.length === 1 ? orgaTags[0].name : ``; - if (await this.promptService.open(dialogTitle, dialogSubtitle)) { + const content = orgaTags.length === 1 ? orgaTags[0].name : ``; + if (await this.promptService.open(title, content)) { await this.repo.delete(...orgaTags); } }