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

Allow to set state as submitter in client.

Browse Source
This commit is contained in:
Emanuel Schütze 2019-02-01 16:30:50 +01:00
parent 286c81e007
commit d4cc3c3720
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -222,12 +222,14 @@
<button *ngFor="let state of motion.nextStates" mat-menu-item (click)="setState(state.id)"> <button *ngFor="let state of motion.nextStates" mat-menu-item (click)="setState(state.id)">
{{ state.name | translate }} <span *ngIf="state.show_state_extension_field">&nbsp;...</span> {{ state.name | translate }} <span *ngIf="state.show_state_extension_field">&nbsp;...</span>
</button> </button>
<mat-divider></mat-divider> <div *ngIf="perms.isAllowed('change_metadata', motion)">
<button mat-menu-item (click)="setState(null)" *ngIf="perms.isAllowed('change_metadata', motion)"> <mat-divider *ngIf="motion.nextStates.length > 0"></mat-divider>
<button mat-menu-item (click)="setState(null)">
<mat-icon>replay</mat-icon> {{ 'Reset state' | translate }} <mat-icon>replay</mat-icon> {{ 'Reset state' | translate }}
</button> </button>
</div>
</mat-menu> </mat-menu>
<div *ngIf="perms.isAllowed('change_metadata', motion)"> <div *ngIf="perms.isAllowed('change_state', motion)">
<mat-basic-chip [matMenuTriggerFor]="stateMenu" [ngClass]="getStateCssColor()"> <mat-basic-chip [matMenuTriggerFor]="stateMenu" [ngClass]="getStateCssColor()">
{{ stateLabel }} {{ stateLabel }}
</mat-basic-chip> </mat-basic-chip>
@ -238,7 +240,7 @@
<button mat-icon-button (click)="setStateExtension()"><mat-icon>check</mat-icon></button> <button mat-icon-button (click)="setStateExtension()"><mat-icon>check</mat-icon></button>
</div> </div>
</div> </div>
<div *ngIf="!perms.isAllowed('change_metadata', motion)"> <div *ngIf="!perms.isAllowed('change_state', motion)">
<mat-basic-chip [ngClass]="getStateCssColor()"> {{ stateLabel }} </mat-basic-chip> <mat-basic-chip [ngClass]="getStateCssColor()"> {{ stateLabel }} </mat-basic-chip>
</div> </div>
</div> </div>

14
client/src/app/site/motions/services/local-permissions.service.ts
View File

@ -108,6 +108,20 @@ export class LocalPermissionsService {
motion.state.allow_submitter_edit && motion.state.allow_submitter_edit &&
motion.submitters.some(submitter => submitter.id === this.operator.user.id) motion.submitters.some(submitter => submitter.id === this.operator.user.id)
); );
case 'change_state':
// check also for empty ViewMotion object (e.g. if motion.id is null)
// important for creating new motion as normal user
if (!motion || !motion.id) {
return false;
}
return (
this.operator.hasPerms('motions.can_manage') ||
this.operator.hasPerms('motions.can_manage_metadata') ||
(motion.state &&
motion.state.allow_submitter_edit &&
motion.submitters &&
motion.submitters.some(submitter => submitter.id === this.operator.user.id))
);
case 'change_metadata': case 'change_metadata':
return ( return (
this.operator.hasPerms('motions.can_manage') || this.operator.hasPerms('motions.can_manage') ||