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

Merge pull request #5888 from tsiegleauq/some-iOS-for-fixes 

Fix paragraph based amendments in iOS
This commit is contained in:
Emanuel Schütze 2021-02-12 14:58:53 +01:00 committed by GitHub
parent c1b4d3154d eda242e83f
commit 7af39a5570
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -537,9 +537,7 @@
type="button" type="button"
mat-button mat-button
[matMenuTriggerFor]="changeRecoMenu" [matMenuTriggerFor]="changeRecoMenu"
*ngIf=" *ngIf="motion && (hasChangingObjects() || motion.modified_final_version)"
motion && (hasChangingObjects() || motion.modified_final_version)
"
> >
<mat-icon>rate_review</mat-icon> <mat-icon>rate_review</mat-icon>
&nbsp;<span>{{ verboseChangeRecoMode[crMode] | translate }}</span> &nbsp;<span>{{ verboseChangeRecoMode[crMode] | translate }}</span>
@ -670,7 +668,9 @@
</div> </div>
<!-- Text (hide preamble, if diff mode. The preample is included in the motion-detail-diff component) --> <!-- Text (hide preamble, if diff mode. The preample is included in the motion-detail-diff component) -->
<span *ngIf="showPreamble && !isRecoMode(ChangeRecoMode.Diff)" class="text-prefix-label">{{ preamble | translate }}</span> <span *ngIf="showPreamble && !isRecoMode(ChangeRecoMode.Diff)" class="text-prefix-label">{{
preamble | translate
}}</span>
<!-- Regular motions or traditional amendments --> <!-- Regular motions or traditional amendments -->
<ng-container *ngIf="!editMotion && !motion.isStatuteAmendment() && !motion.isParagraphBasedAmendment()"> <ng-container *ngIf="!editMotion && !motion.isStatuteAmendment() && !motion.isParagraphBasedAmendment()">
@ -902,7 +902,7 @@
</div> </div>
<ng-container *ngIf="motion.parent && !isRecoMode(ChangeRecoMode.Diff) && !isFinalEdit"> <ng-container *ngIf="motion.parent && !isRecoMode(ChangeRecoMode.Diff) && !isFinalEdit">
<div <div
*ngFor="let paragraph of getAmendmentParagraphs()" *ngFor="let paragraph of getAmendmentParagraphs(); trackBy: trackByIndex"
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()"