#1410 Hide invisible organistions

TheHive-Project · Jul 22, 2020 · 4560cbc · 4560cbc
1 parent fc9262d
commit 4560cbc
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/thehive/app/org/thp/thehive/services/UserSrv.scala b/thehive/app/org/thp/thehive/services/UserSrv.scala
@@ -272,12 +272,12 @@ class UserSteps(raw: GremlinScala[Vertex])(implicit @Named("with-thehive-schema"
       .project(
         _.by
           .by(_.avatar.fold)
-          .by(_.role.project(_.by(_.profile).by(_.organisation.name)).fold)
+          .by(_.role.project(_.by(_.profile).by(_.organisation.visible.name.fold)).fold)
       )
       .map {
         case (user, attachment, profileOrganisations) =>
-          val po = profileOrganisations.asScala.map {
-            case (profile, organisationName) => profile.as[Profile] -> organisationName
+          val po = profileOrganisations.asScala.collect {
+            case (profile, organisationName) if !organisationName.isEmpty => profile.as[Profile] -> organisationName.get(0)
           }
           po.find(_._2 == authContext.organisation)
             .orElse(po.headOption)