Fix certain permission checks
Fixed permissions in topic detail, agenda list and user detail. Fixes Z-Level of head bar and mat-spinner.
This commit is contained in:
parent
09ddc83d30
commit
5d35a0fa5f
@ -11,7 +11,7 @@
|
||||
position: -o-sticky;
|
||||
position: sticky;
|
||||
top: 0px;
|
||||
z-index: 3;
|
||||
z-index: 5;
|
||||
}
|
||||
|
||||
.toolbar-left {
|
||||
|
@ -54,7 +54,7 @@
|
||||
<mat-header-cell *matHeaderCellDef mat-sort-header>Info</mat-header-cell>
|
||||
<mat-cell (click)="openEditInfo(item, $event)" *matCellDef="let item">
|
||||
<div class="info-col-items">
|
||||
<div *ngIf="item.verboseType">
|
||||
<div *osPerms="'agenda.can_manage';and:item.verboseType">
|
||||
<mat-icon>visibility</mat-icon>
|
||||
{{ item.verboseType | translate }}
|
||||
</div>
|
||||
|
@ -33,12 +33,12 @@ export class AgendaListComponent extends ListViewBaseComponent<ViewItem, Item> i
|
||||
/**
|
||||
* Determine the display columns in desktop view
|
||||
*/
|
||||
public displayedColumnsDesktop: string[] = ['title', 'info', 'speakers', 'menu'];
|
||||
public displayedColumnsDesktop: string[] = ['title', 'info', 'speakers'];
|
||||
|
||||
/**
|
||||
* Determine the display columns in mobile view
|
||||
*/
|
||||
public displayedColumnsMobile: string[] = ['title', 'speakers', 'menu'];
|
||||
public displayedColumnsMobile: string[] = ['title', 'speakers'];
|
||||
|
||||
public isNumberingAllowed: boolean;
|
||||
|
||||
@ -263,6 +263,9 @@ export class AgendaListComponent extends ListViewBaseComponent<ViewItem, Item> i
|
||||
*/
|
||||
public getColumnDefinition(): string[] {
|
||||
let columns = this.vp.isMobile ? this.displayedColumnsMobile : this.displayedColumnsDesktop;
|
||||
if (this.operator.hasPerms('agenda.can_manage')) {
|
||||
columns = columns.concat(['menu']);
|
||||
}
|
||||
if (this.operator.hasPerms('core.can_manage_projector') && !this.isMultiSelect) {
|
||||
columns = ['projector'].concat(columns);
|
||||
}
|
||||
|
@ -63,7 +63,7 @@
|
||||
}
|
||||
|
||||
.add-self-buttons {
|
||||
padding: 0 0 20px 25px;
|
||||
padding: 20px 0 20px 25px;
|
||||
}
|
||||
|
||||
.speaker-warning {
|
||||
|
@ -111,9 +111,11 @@
|
||||
<mat-icon>mic</mat-icon>
|
||||
<span translate>List of speakers</span>
|
||||
</button>
|
||||
<mat-divider></mat-divider>
|
||||
<button mat-menu-item class="red-warning-text" (click)="onDeleteButton()">
|
||||
<mat-icon>delete</mat-icon>
|
||||
<span translate>Delete</span>
|
||||
</button>
|
||||
<div *osPerms="'agenda.can_manage'">
|
||||
<mat-divider></mat-divider>
|
||||
<button mat-menu-item class="red-warning-text" (click)="onDeleteButton()">
|
||||
<mat-icon>delete</mat-icon>
|
||||
<span translate>Delete</span>
|
||||
</button>
|
||||
</div>
|
||||
</mat-menu>
|
||||
|
@ -230,9 +230,9 @@ export class TopicDetailComponent extends BaseViewComponent {
|
||||
public isAllowed(action: string): boolean {
|
||||
switch (action) {
|
||||
case 'see':
|
||||
return this.operator.hasPerms('agenda.can_manage');
|
||||
case 'edit':
|
||||
return this.operator.hasPerms('agenda.can_see');
|
||||
case 'edit':
|
||||
return this.operator.hasPerms('agenda.can_manage');
|
||||
case 'default':
|
||||
return false;
|
||||
}
|
||||
|
@ -24,6 +24,7 @@ mat-form-field {
|
||||
right: 0;
|
||||
margin-left: auto;
|
||||
margin-right: auto;
|
||||
z-index: 2;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -16,7 +16,12 @@
|
||||
|
||||
<!-- Menu -->
|
||||
<div class="menu-slot">
|
||||
<button type="button" mat-icon-button *ngIf="isAllowed('changePersonal')" [matMenuTriggerFor]="userExtraMenu">
|
||||
<button
|
||||
type="button"
|
||||
mat-icon-button
|
||||
*ngIf="isAllowed('changePersonal') && isAllowed('changePassword')"
|
||||
[matMenuTriggerFor]="userExtraMenu"
|
||||
>
|
||||
<mat-icon>more_vert</mat-icon>
|
||||
</button>
|
||||
</div>
|
||||
|
Loading…
Reference in New Issue
Block a user