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

Merge pull request #4434 from MaximilianKrambach/stopProopagation

Browse Source 
fix click events in user + mediafile views
This commit is contained in:
Emanuel Schütze 2019-02-28 16:18:10 +01:00 committed by GitHub
commit 8c68e93596
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/app/site/mediafiles/components/mediafile-list/mediafile-list.component.html
View File

@ -107,6 +107,7 @@
<div <div
*ngIf="getFileSettings(file).length > 0" *ngIf="getFileSettings(file).length > 0"
[matMenuTriggerFor]="singleFileMenu" [matMenuTriggerFor]="singleFileMenu"
(click)="$event.stopPropagation()"
[matMenuTriggerData]="{ file: file }" [matMenuTriggerData]="{ file: file }"
[matTooltip]="formatIndicatorTooltip(file)" [matTooltip]="formatIndicatorTooltip(file)"
> >
@ -123,6 +124,7 @@
<button <button
mat-icon-button mat-icon-button
[matMenuTriggerFor]="singleFileMenu" [matMenuTriggerFor]="singleFileMenu"
(click)="$event.stopPropagation()"
[matMenuTriggerData]="{ file: file }" [matMenuTriggerData]="{ file: file }"
[disabled]="isMultiSelect" [disabled]="isMultiSelect"
> >

2
client/src/app/site/users/components/user-list/user-list.component.html
View File

@ -81,7 +81,7 @@
<div *ngIf="user.is_active"> <div *ngIf="user.is_active">
<mat-checkbox <mat-checkbox
class="checkboxPresent" class="checkboxPresent"
(click)="setPresent(user)" (click)="setPresent(user, $event)"
[checked]="user.is_present" [checked]="user.is_present"
[disabled]="isMultiSelect" [disabled]="isMultiSelect"
> >

4
client/src/app/site/users/components/user-list/user-list.component.ts
View File

@ -394,8 +394,10 @@ export class UserListComponent extends ListViewBaseComponent<ViewUser, User> imp
* Sets the user present * Sets the user present
* *
* @param viewUser the viewUser Object * @param viewUser the viewUser Object
* @param event the mouse event (to prevent propagaton to row triggers)
*/ */
public async setPresent(viewUser: ViewUser): Promise<void> { public async setPresent(viewUser: ViewUser, event: MouseEvent): Promise<void> {
event.stopPropagation();
viewUser.user.is_present = !viewUser.user.is_present; viewUser.user.is_present = !viewUser.user.is_present;
await this.repo.update(viewUser.user, viewUser); await this.repo.update(viewUser.user, viewUser);
} }