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

Fix order of comments in motion detail

Browse Source 
Fixes an error where the order of comment section in
the motion comment section component was wrong
This commit is contained in:
Sean Engelhardt 2019-12-12 12:10:56 +01:00
parent bb41125bd1
commit f64a855b50
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
import { Component, Input } from '@angular/core';
import { Component, Input, OnInit } from '@angular/core';
import { FormBuilder, FormGroup } from '@angular/forms';
import { MatSnackBar } from '@angular/material/snack-bar';
import { Title } from '@angular/platform-browser';
@ -21,7 +21,7 @@ import { MotionPdfExportService } from 'app/site/motions/services/motion-pdf-exp
templateUrl: './motion-comments.component.html',
styleUrls: ['./motion-comments.component.scss']
})
export class MotionCommentsComponent extends BaseViewComponent {
export class MotionCommentsComponent extends BaseViewComponent implements OnInit {
/**
* An array of all sections the operator can see.
*/
@ -79,20 +79,28 @@ export class MotionCommentsComponent extends BaseViewComponent {
matSnackBar: MatSnackBar
) {
super(titleService, translate, matSnackBar);
}
this.commentRepo.getViewModelListObservable().subscribe(sections => this.setSections(sections));
this.operator.getUserObservable().subscribe(() => this.setSections(this.commentRepo.getViewModelList()));
public ngOnInit(): void {
this.subscriptions.push(
this.commentRepo.getViewModelListObservable().subscribe(sections => {
if (sections && sections.length) {
this.sections = sections;
this.filterSections();
}
})
);
}
/**
* sets the `sections` member with sections, if the operator has reading permissions.
*
* @param allSections A list of all sections available
*/
private setSections(allSections: ViewMotionCommentSection[]): void {
this.sections = allSections.filter(section => this.operator.isInGroupIds(...section.read_groups_id));
private filterSections(): void {
if (this.sections && this.sections.length) {
this.sections = this.sections.filter(section => this.operator.isInGroupIds(...section.read_groups_id));
this.updateComments();
}
}
/**
* Returns true if the operator has write permissions for the given section, so he can edit the comment.