diff --git a/client/src/app/domain/models/topics/topic.ts b/client/src/app/domain/models/topics/topic.ts index cd005c69d3..ef1ded374f 100644 --- a/client/src/app/domain/models/topics/topic.ts +++ b/client/src/app/domain/models/topics/topic.ts @@ -5,7 +5,6 @@ import { HasAgendaItemId } from '../../interfaces/has-agenda-item-id'; import { HasAttachmentIds } from '../../interfaces/has-attachment-ids'; import { HasListOfSpeakersId } from '../../interfaces/has-list-of-speakers-id'; import { HasMeetingId } from '../../interfaces/has-meeting-id'; -import { HasTagIds } from '../../interfaces/has-tag-ids'; import { BaseModel } from '../base/base-model'; /** @@ -30,7 +29,6 @@ export class Topic extends BaseModel { `attachment_ids`, `agenda_item_id`, `list_of_speakers_id`, - `tag_ids`, `meeting_id` ]; } @@ -39,6 +37,5 @@ export interface Topic HasAgendaItemId, HasListOfSpeakersId, HasAttachmentIds, - HasTagIds, HasSequentialNumber, HasPollIds {} diff --git a/client/src/app/gateways/repositories/agenda/functions.ts b/client/src/app/gateways/repositories/agenda/functions.ts index 15d39bdf3b..b1ea032ca5 100644 --- a/client/src/app/gateways/repositories/agenda/functions.ts +++ b/client/src/app/gateways/repositories/agenda/functions.ts @@ -13,6 +13,6 @@ export function createAgendaItem(model: any): any { agenda_parent_id: model.agenda_parent_id, agenda_type: model.agenda_type, agenda_weight: model.agenda_weight, - tag_ids: model.tag_ids + 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 5ec99e17bf..52ff4bd246 100644 --- a/client/src/app/gateways/repositories/topics/topic-repository.service.ts +++ b/client/src/app/gateways/repositories/topics/topic-repository.service.ts @@ -30,8 +30,7 @@ export class TopicRepositoryService extends BaseAgendaItemAndListOfSpeakersConte id: viewModel.id, text: update.text, title: update.title, - attachment_ids: update.attachment_ids || [], - tag_ids: update.tag_ids || [] + attachment_ids: update.attachment_ids || [] }; return this.sendActionToBackend(TopicAction.UPDATE, payload); } diff --git a/client/src/app/infrastructure/definitions/relations/relations.ts b/client/src/app/infrastructure/definitions/relations/relations.ts index 7dcd4de9a0..e23ed14205 100644 --- a/client/src/app/infrastructure/definitions/relations/relations.ts +++ b/client/src/app/infrastructure/definitions/relations/relations.ts @@ -721,7 +721,7 @@ export const RELATIONS: Relation[] = [ // ########## Tags ...makeGenericM2M({ viewModel: ViewTag, - possibleViewModels: [ViewAgendaItem, ViewAssignment, ViewMotion, ViewTopic], + possibleViewModels: [ViewAgendaItem, ViewAssignment, ViewMotion], viewModelField: `tagged`, viewModelIdField: `tagged_ids`, possibleViewModelsField: `tags` diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/view-models/view-topic.ts b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/view-models/view-topic.ts index 78d8811b86..9e5f3d0444 100644 --- a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/view-models/view-topic.ts +++ b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/view-models/view-topic.ts @@ -5,7 +5,6 @@ import { BaseProjectableViewModel } from 'src/app/site/pages/meetings/view-model import { HasMeeting } from 'src/app/site/pages/meetings/view-models/has-meeting'; import { HasAttachment } from '../../../../mediafiles/view-models/has-attachment'; -import { HasTags } from '../../../../motions/modules/tags/view-models/has-tags'; import { HasPolls, VotingTextContext } from '../../../../polls'; export class ViewTopic extends BaseProjectableViewModel { @@ -42,7 +41,6 @@ export class ViewTopic extends BaseProjectableViewModel { export interface ViewTopic extends Topic, HasAttachment, - HasTags, HasAgendaItem, HasListOfSpeakers, HasMeeting,