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

Merge pull request #5052 from tsiegleauq/show-motion-context 

Fix showing content of amendments
This commit is contained in:
Emanuel Schütze 2019-09-24 18:02:40 +02:00 committed by GitHub
parent 23a7f26437 48321fa2b7
commit a82789d201
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/src/app/site/motions/modules/motion-detail/components/motion-detail/motion-detail.component.html
View File

@ -857,12 +857,11 @@
<section class="text-holder"> <section class="text-holder">
<!-- If the array exists, we do not have an error --> <!-- If the array exists, we do not have an error -->
<div *ngIf="motion.diffLines"> <div *ngIf="motion.diffLines">
<!-- <div class="alert alert-info" *ngIf="getAmendmentParagraphs(showAmendmentContext).length === 0"> -->
<div class="alert alert-info" *ngIf="motion.diffLines.length === 0"> <div class="alert alert-info" *ngIf="motion.diffLines.length === 0">
<span translate>No changes at the text.</span> <span translate>No changes at the text.</span>
</div> </div>
<div <div
*ngFor="let paragraph of motion.diffLines" *ngFor="let paragraph of getAmendmentParagraphs(showAmendmentContext)"
class="motion-text motion-text-diff amendment-view" class="motion-text motion-text-diff amendment-view"
[class.line-numbers-none]="isLineNumberingNone()" [class.line-numbers-none]="isLineNumberingNone()"
[class.line-numbers-inline]="isLineNumberingInline()" [class.line-numbers-inline]="isLineNumberingInline()"

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

@ -859,6 +859,7 @@ export class MotionDetailComponent extends BaseViewComponent implements OnInit,
/** /**
* If `this.motion` is an amendment, this returns the list of all changed paragraphs. * If `this.motion` is an amendment, this returns the list of all changed paragraphs.
* TODO: Cleanup: repo function could be injected part of the model, to have easier access
* *
* @param {boolean} includeUnchanged * @param {boolean} includeUnchanged
* @returns {DiffLinesInParagraph[]} * @returns {DiffLinesInParagraph[]}