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

Merge pull request #4907 from tsiegleauq/subcategory-for-delegates

Browse Source 
Show subcategory in detail for every permission
This commit is contained in:
Emanuel Schütze 2019-08-08 16:39:59 +02:00 committed by GitHub
commit 90eb8e04f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -267,7 +267,11 @@
</button>
<div>
<mat-divider *ngIf="motion.state.next_states.length > 0"></mat-divider>
<button *ngFor="let state of motion.state.previous_states" mat-menu-item (click)="setState(state.id)">
<button
*ngFor="let state of motion.state.previous_states"
mat-menu-item
(click)="setState(state.id)"
>
<mat-icon>arrow_back</mat-icon> {{ state.name | translate }}
<span *ngIf="state.show_state_extension_field">&nbsp;...</span>
</button>
@ -280,7 +284,7 @@
</div>
<!-- Recommendation -->
<div *ngIf="recommender && !editMotion">
<div *ngIf="(perms.isAllowed('change_metadata') || motion.recommendation) && recommender && !editMotion">
<os-extension-field
title="{{ recommender }}"
[inputValue]="recommendationStateExtension"
@ -362,7 +366,13 @@
class="grey"
disableRipple
>
{{ motion.category.prefixedNameWithParents }}
<div *ngIf="motion.category">
<div *ngIf="motion.category.parent">
{{ motion.category.parent }}
</div>
<span *ngIf="motion.category.parent">{{ 'Subcategory' | translate }}:</span>
{{ motion.category }}
</div>
</mat-basic-chip>
</div>
@ -761,7 +771,12 @@
<div class="motion-text" *ngIf="!editMotion"><div [innerHtml]="sanitizedText(motion.reason)"></div></div>
<!-- The HTML Editor -->
<editor formControlName="reason" [init]="tinyMceSettings" *ngIf="editMotion" [required]="reasonRequired"></editor>
<editor
formControlName="reason"
[init]="tinyMceSettings"
*ngIf="editMotion"
[required]="reasonRequired"
></editor>
<div
*ngIf="
reasonRequired &&