From d09ac5bcc66daa874bc80e3725f9438d521e8e96 Mon Sep 17 00:00:00 2001
From: Johannes Zellner <johannes@cloudron.io>
Date: Thu, 28 Feb 2019 15:56:19 +0100
Subject: [PATCH] stop notification click event propagation

---
 src/views/notifications.html | 2 +-
 src/views/notifications.js   | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/views/notifications.html b/src/views/notifications.html
index 1c70c5b6c..7998b15cc 100644
--- a/src/views/notifications.html
+++ b/src/views/notifications.html
@@ -21,7 +21,7 @@
     <div class="row">
       <div class="col-xs-12" ng-click="notification.isCollapsed = !notification.isCollapsed" ng-class="{ 'notification-details': notification.detailsShown }">
         {{ notification.title }} <small class="text-muted" uib-tooltip="{{ notification.creationTime | prettyLongDate }}">{{ notification.creationTime | prettyDate }}</small>
-        <button class="btn btn-xs btn-success pull-right" ng-hide="notification.acknowledged" ng-click="notifications.ack(notification)" uib-tooltip="Clear"><i class="fa fa-check"></i></button>
+        <button class="btn btn-xs btn-success pull-right" ng-hide="notification.acknowledged" ng-click="notifications.ack(notification, $event)" uib-tooltip="Clear"><i class="fa fa-check"></i></button>
 
         <div uib-collapse="notification.isCollapsed" expanding="notificationExpanding(notification)">
           <br/>
diff --git a/src/views/notifications.js b/src/views/notifications.js
index f084391c2..23cab4b2b 100644
--- a/src/views/notifications.js
+++ b/src/views/notifications.js
@@ -44,9 +44,11 @@ angular.module('Application').controller('NotificationsController', ['$scope', '
             $scope.notifications.activeNotification = notification;
         },
 
-        ack: function (notification, callback) {
+        ack: function (notification, event, callback) {
             callback = callback || function (error) { if (error) console.error(error); };
 
+            if (event) event.stopPropagation();
+
             Client.ackNotification(notification.id, function (error) {
                 if (error) return callback(error);
 
@@ -66,7 +68,7 @@ angular.module('Application').controller('NotificationsController', ['$scope', '
 
             asyncForEach($scope.notifications.notifications, function (notification, callback) {
                 if (notification.acknowledged) return callback();
-                $scope.notifications.ack(notification, callback);
+                $scope.notifications.ack(notification, null /* no click event */, callback);
             }, function (error) {
                 if (error) console.error(error);