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

Merge pull request #5777 from tsiegleauq/see-own-vote-delegations-in-profile 

Show vote delegations to users on ownPage
This commit is contained in:
Emanuel Schütze 2020-12-16 13:35:35 +01:00 committed by GitHub
parent 222a2ea581 f07cc4e176
commit 266c129e04
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
client/src/app/site/users/components/user-detail/user-detail.component.html
View File

@ -154,7 +154,7 @@
</mat-form-field> </mat-form-field>
</div> </div>
<div *osPerms="permission.usersCanManage"> <div *ngIf="isAllowed('manage')">
<!-- Groups --> <!-- Groups -->
<mat-form-field> <mat-form-field>
<os-search-value-selector <os-search-value-selector
@ -185,9 +185,7 @@
[inputListValues]="users" [inputListValues]="users"
></os-search-value-selector> ></os-search-value-selector>
</mat-form-field> </mat-form-field>
</div>
<div *ngIf="isAllowed('manage')">
<!-- Initial Password --> <!-- Initial Password -->
<mat-form-field> <mat-form-field>
<input <input
@ -318,12 +316,13 @@
{{ group.getTitle() | translate }}<span *ngIf="!last">,&nbsp;</span> {{ group.getTitle() | translate }}<span *ngIf="!last">,&nbsp;</span>
</span> </span>
</div> </div>
<div *ngIf="!user.groups || user.groups.length === 0"> <div *ngIf="!user.groups || user.groups.length === 0">
<h4>{{ 'Groups' | translate }}</h4> <h4>{{ 'Groups' | translate }}</h4>
<span>{{ 'Default group' | translate }}</span> <span>{{ 'Default group' | translate }}</span>
</div> </div>
<div *ngIf="isAllowed('manage')"> <div *ngIf="isAllowed('manage') || ownPage">
<!-- Own Vote delegations --> <!-- Own Vote delegations -->
<div *ngIf="user.voteDelegatedTo"> <div *ngIf="user.voteDelegatedTo">
<h4>{{ 'Voting right delegated to (proxy)' | translate }}</h4> <h4>{{ 'Voting right delegated to (proxy)' | translate }}</h4>
@ -341,7 +340,9 @@
<h4>{{ 'Vote weight' | translate }}</h4> <h4>{{ 'Vote weight' | translate }}</h4>
<span>{{ user.vote_weight }}</span> <span>{{ user.vote_weight }}</span>
</div> </div>
</div>
<div *ngIf="isAllowed('manage')">
<!-- Username --> <!-- Username -->
<div *ngIf="user.username"> <div *ngIf="user.username">
<h4>{{ 'Username' | translate }}</h4> <h4>{{ 'Username' | translate }}</h4>