diff --git a/client/src/app/shared/models/motions/motion-change-reco.ts b/client/src/app/shared/models/motions/motion-change-reco.ts index 05aa22b51..8abd10c19 100644 --- a/client/src/app/shared/models/motions/motion-change-reco.ts +++ b/client/src/app/shared/models/motions/motion-change-reco.ts @@ -8,6 +8,7 @@ export class MotionChangeReco extends BaseModel { public id: number; public motion_id: number; public rejected: boolean; + public internal: boolean; public type: number; public other_description: string; public line_from: number; diff --git a/client/src/app/site/motions/components/motion-change-recommendation/motion-change-recommendation.component.html b/client/src/app/site/motions/components/motion-change-recommendation/motion-change-recommendation.component.html index 70bc3529c..d2f850eec 100644 --- a/client/src/app/site/motions/components/motion-change-recommendation/motion-change-recommendation.component.html +++ b/client/src/app/site/motions/components/motion-change-recommendation/motion-change-recommendation.component.html @@ -10,6 +10,8 @@ + + {{ 'Public' | translate }} diff --git a/client/src/app/site/motions/components/motion-change-recommendation/motion-change-recommendation.component.ts b/client/src/app/site/motions/components/motion-change-recommendation/motion-change-recommendation.component.ts index 179921432..2d737d2bb 100644 --- a/client/src/app/site/motions/components/motion-change-recommendation/motion-change-recommendation.component.ts +++ b/client/src/app/site/motions/components/motion-change-recommendation/motion-change-recommendation.component.ts @@ -24,7 +24,7 @@ export interface MotionChangeRecommendationComponentData { * editChangeRecommendation: false, * newChangeRecommendation: true, * lineRange: lineRange, - * motion: this.motion, + * changeReco: this.changeRecommendation, * }; * this.dialogService.open(MotionChangeRecommendationComponent, { * height: '400px', @@ -104,14 +104,16 @@ export class MotionChangeRecommendationComponent { public createForm(): void { this.contentForm = this.formBuilder.group({ text: [this.changeReco.text, Validators.required], - diffType: [this.changeReco.type, Validators.required] + diffType: [this.changeReco.type, Validators.required], + public: [!this.changeReco.internal] }); } public saveChangeRecommendation(): void { this.changeReco.updateChangeReco( this.contentForm.controls.diffType.value, - this.contentForm.controls.text.value + this.contentForm.controls.text.value, + !this.contentForm.controls.public.value ); if (this.newReco) { diff --git a/client/src/app/site/motions/components/motion-detail-diff/motion-detail-diff.component.html b/client/src/app/site/motions/components/motion-detail-diff/motion-detail-diff.component.html index 76951821d..73363f427 100644 --- a/client/src/app/site/motions/components/motion-detail-diff/motion-detail-diff.component.html +++ b/client/src/app/site/motions/components/motion-detail-diff/motion-detail-diff.component.html @@ -111,6 +111,10 @@ Reject done +