From cab0d3d83aebbc1340f18c46cc2644e9e18ea03d Mon Sep 17 00:00:00 2001 From: To-om Date: Sat, 23 May 2020 08:04:12 +0200 Subject: [PATCH] #1324 Deduplicate dashboards --- ScalliGraph | 2 +- thehive/app/org/thp/thehive/controllers/v0/DashboardCtrl.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ScalliGraph b/ScalliGraph index 9e975277ba..ab5c8113d9 160000 --- a/ScalliGraph +++ b/ScalliGraph @@ -1 +1 @@ -Subproject commit 9e975277ba5e4318f43d401d4bfc6ce8d7cb1613 +Subproject commit ab5c8113d927722f52e6e655d2eb3ffc49bc38b6 diff --git a/thehive/app/org/thp/thehive/controllers/v0/DashboardCtrl.scala b/thehive/app/org/thp/thehive/controllers/v0/DashboardCtrl.scala index 11796a088a..318123ba40 100644 --- a/thehive/app/org/thp/thehive/controllers/v0/DashboardCtrl.scala +++ b/thehive/app/org/thp/thehive/controllers/v0/DashboardCtrl.scala @@ -31,7 +31,7 @@ class DashboardCtrl @Inject() ( union(dashboardSrv)( t => organisationSrv.steps(db.labelFilter(organisationSrv.model)(t))(graph).get(authContext.organisation).dashboards, t => userSrv.steps(db.labelFilter(userSrv.model)(t))(graph).current(authContext).dashboards - )(graph) + )(graph).dedup ) override val getQuery: ParamQuery[IdOrName] = Query.initWithParam[IdOrName, DashboardSteps](