commit 4b559012c8012f2f3b6d48ce6590f14c2ea2de30
author Ravi Mistry <rmistry@google.com> Fri Dec 21 09:40:46 2018 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Dec 21 15:05:39 2018 +0000
tree 4027ac97a78992127e010d50f5c6da45970a14e7
parent 5e4a28a72bf8254979e4193942511a9a88910f61

[AM] Do not show active alert for owner if assigned to somebody else

Bug: skia:8645
Change-Id: I9061cfe5791a7f94a1286a97f6c127a6a2cc81f4
Reviewed-on: https://skia-review.googlesource.com/c/179739
Reviewed-by: Ravi Mistry <rmistry@google.com>
Commit-Queue: Ravi Mistry <rmistry@google.com>

am/modules/alert-manager-sk/alert-manager-sk.js

diff --git a/am/modules/alert-manager-sk/alert-manager-sk.js b/am/modules/alert-manager-sk/alert-manager-sk.js
index 3dac5a1..4b3aaab 100644
--- a/am/modules/alert-manager-sk/alert-manager-sk.js
+++ b/am/modules/alert-manager-sk/alert-manager-sk.js
@@ -163,7 +163,7 @@
   </tabs-sk>
   <tabs-panel-sk>
     <section class=mine>
-      ${incidentList(ele, ele._incidents.filter(i => i.active && ((ele._user === ele._trooper && (i.params.__silence_state !== 'silenced')) || (i.params.assigned_to === ele._user) || (i.params.owner === ele._user))))}
+      ${incidentList(ele, ele._incidents.filter(i => i.active && ((ele._user === ele._trooper && (i.params.__silence_state !== 'silenced')) || (i.params.assigned_to === ele._user) || (i.params.owner === ele._user && i.params.assigned_to === ''))))}
     </section>
     <section class=incidents>
       ${incidentList(ele, ele._incidents)}
@@ -587,7 +587,8 @@
       && (
         (isTrooper && !incident.params.assigned_to)
         || (incident.params.assigned_to == this._user)
-        || (incident.params.owner == this._user)
+        || (incident.params.owner == this._user
+            && incident.params.assigned_to === '')
       )
     ) {
       return true