ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4620 from MaximilianKrambach/tags_in_amendment

Browse Source 
copy parent's tags to a new amendment
This commit is contained in:
Emanuel Schütze 2019-04-24 16:19:16 +02:00 committed by GitHub
commit 677caa4524
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/src/app/site/motions/modules/motion-detail/components/amendment-create-wizard/amendment-create-wizard.component.ts
View File

@ -212,6 +212,7 @@ export class AmendmentCreateWizardComponent extends BaseViewComponent {
text: text, // Workaround as 'text' is required from the backend text: text, // Workaround as 'text' is required from the backend
parent_id: this.motion.id, parent_id: this.motion.id,
category_id: this.motion.category_id, category_id: this.motion.category_id,
tags_id: this.motion.tags_id,
motion_block_id: this.motion.motion_block_id, motion_block_id: this.motion.motion_block_id,
amendment_paragraphs: amendedParagraphs amendment_paragraphs: amendedParagraphs
}; };

5
client/src/app/site/motions/modules/motion-detail/components/motion-detail/motion-detail.component.ts
View File

@ -617,12 +617,14 @@ export class MotionDetailComponent extends BaseViewComponent implements OnInit,
defaultMotion.title = defaultTitle; defaultMotion.title = defaultTitle;
defaultMotion.parent_id = parentMotion.id; defaultMotion.parent_id = parentMotion.id;
defaultMotion.category_id = parentMotion.category_id; defaultMotion.category_id = parentMotion.category_id;
defaultMotion.tags_id = parentMotion.tags_id;
defaultMotion.motion_block_id = parentMotion.motion_block_id; defaultMotion.motion_block_id = parentMotion.motion_block_id;
this.contentForm.patchValue({ this.contentForm.patchValue({
title: defaultTitle, title: defaultTitle,
category_id: parentMotion.category_id, category_id: parentMotion.category_id,
motion_block_id: parentMotion.motion_block_id, motion_block_id: parentMotion.motion_block_id,
parent_id: parentMotion.id parent_id: parentMotion.id,
tags_id: parentMotion.tags_id
}); });
} }
if (mode === 'fulltext') { if (mode === 'fulltext') {
@ -697,6 +699,7 @@ export class MotionDetailComponent extends BaseViewComponent implements OnInit,
submitters_id: [], submitters_id: [],
supporters_id: [[]], supporters_id: [[]],
workflow_id: [], workflow_id: [],
tags_id: [],
origin: [''], origin: [''],
selected_paragraphs: [], selected_paragraphs: [],
statute_amendment: [''], // Internal value for the checkbox, not saved to the model statute_amendment: [''], // Internal value for the checkbox, not saved to the model