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

Fix error for freely editable amendments

Browse Source 
Recent changes to amendment had various bugs.
This one regarded the amendment list, where amendments without amendmend
paragraphs returned several errors.
This commit is contained in:
Sean 2020-06-08 16:24:21 +02:00 committed by Emanuel Schütze
parent 4673c741e9
commit d4f211e344
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/src/app/core/repositories/motions/motion-repository.service.ts
View File

@ -798,7 +798,7 @@ export class MotionRepositoryService extends BaseIsAgendaItemAndListOfSpeakersCo
} }
}); });
return amendment.amendment_paragraphs.map((newText: string, paraNo: number) => { return amendment.amendment_paragraphs?.map((newText: string, paraNo: number) => {
let paragraph: string; let paragraph: string;
let paragraphHasChanges; let paragraphHasChanges;
@ -866,7 +866,7 @@ export class MotionRepositoryService extends BaseIsAgendaItemAndListOfSpeakersCo
} }
return amendmentParagraphs return amendmentParagraphs
.map( ?.map(
(newText: string, paraNo: number): DiffLinesInParagraph => { (newText: string, paraNo: number): DiffLinesInParagraph => {
if (newText !== null) { if (newText !== null) {
return this.diff.getAmendmentParagraphsLines( return this.diff.getAmendmentParagraphsLines(
@ -937,7 +937,7 @@ export class MotionRepositoryService extends BaseIsAgendaItemAndListOfSpeakersCo
const changedAmendmentParagraphs = this.applyChangesToAmendment(amendment, lineLength, changeRecos, false); const changedAmendmentParagraphs = this.applyChangesToAmendment(amendment, lineLength, changeRecos, false);
return changedAmendmentParagraphs return changedAmendmentParagraphs
.map( ?.map(
(newText: string, paraNo: number): ViewMotionAmendedParagraph => { (newText: string, paraNo: number): ViewMotionAmendedParagraph => {
if (newText === null) { if (newText === null) {
return null; return null;

4
client/src/app/site/motions/modules/amendment-list/amendment-list.component.ts
View File

@ -134,12 +134,14 @@ export class AmendmentListComponent extends BaseListViewComponent<ViewMotion> im
*/ */
public getAmendmentSummary(amendment: ViewMotion): string { public getAmendmentSummary(amendment: ViewMotion): string {
const diffLines = amendment.diffLines; const diffLines = amendment.diffLines;
if (diffLines) { if (diffLines.length) {
return diffLines return diffLines
.map(diffLine => { .map(diffLine => {
return this.linenumberingService.stripLineNumbers(diffLine.text); return this.linenumberingService.stripLineNumbers(diffLine.text);
}) })
.join('[...]'); .join('[...]');
} else {
return amendment.text;
} }
} }