From feca9e4a18a96d0944fd962a31b4b6d0e7fbf8bf Mon Sep 17 00:00:00 2001
From: Maximilian Krambach <maximilian.krambach@intevation.de>
Date: Thu, 28 Feb 2019 16:05:28 +0100
Subject: [PATCH] fix click events in user + mediafile views

stopped propagation on soome buttons and menus
---
 .../components/mediafile-list/mediafile-list.component.html   | 2 ++
 .../site/users/components/user-list/user-list.component.html  | 2 +-
 .../site/users/components/user-list/user-list.component.ts    | 4 +++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/client/src/app/site/mediafiles/components/mediafile-list/mediafile-list.component.html b/client/src/app/site/mediafiles/components/mediafile-list/mediafile-list.component.html
index d8fd91cfa..75aa1b43c 100644
--- a/client/src/app/site/mediafiles/components/mediafile-list/mediafile-list.component.html
+++ b/client/src/app/site/mediafiles/components/mediafile-list/mediafile-list.component.html
@@ -107,6 +107,7 @@
                 <div
                     *ngIf="getFileSettings(file).length > 0"
                     [matMenuTriggerFor]="singleFileMenu"
+                    (click)="$event.stopPropagation()"
                     [matMenuTriggerData]="{ file: file }"
                     [matTooltip]="formatIndicatorTooltip(file)"
                 >
@@ -123,6 +124,7 @@
                 <button
                     mat-icon-button
                     [matMenuTriggerFor]="singleFileMenu"
+                    (click)="$event.stopPropagation()"
                     [matMenuTriggerData]="{ file: file }"
                     [disabled]="isMultiSelect"
                 >
diff --git a/client/src/app/site/users/components/user-list/user-list.component.html b/client/src/app/site/users/components/user-list/user-list.component.html
index 7be562b9b..4d343347f 100644
--- a/client/src/app/site/users/components/user-list/user-list.component.html
+++ b/client/src/app/site/users/components/user-list/user-list.component.html
@@ -81,7 +81,7 @@
                 <div *ngIf="user.is_active">
                     <mat-checkbox
                         class="checkboxPresent"
-                        (click)="setPresent(user)"
+                        (click)="setPresent(user, $event)"
                         [checked]="user.is_present"
                         [disabled]="isMultiSelect"
                     >
diff --git a/client/src/app/site/users/components/user-list/user-list.component.ts b/client/src/app/site/users/components/user-list/user-list.component.ts
index 3ac415ef3..479306aa1 100644
--- a/client/src/app/site/users/components/user-list/user-list.component.ts
+++ b/client/src/app/site/users/components/user-list/user-list.component.ts
@@ -394,8 +394,10 @@ export class UserListComponent extends ListViewBaseComponent<ViewUser, User> imp
      * Sets the user present
      *
      * @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;
         await this.repo.update(viewUser.user, viewUser);
     }