#1731 Fix taxonomy filter

TheHive-Project · Mar 1, 2021 · 7411e64 · 7411e64
1 parent 3235aaf
commit 7411e64
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/thehive/app/org/thp/thehive/services/TagSrv.scala b/thehive/app/org/thp/thehive/services/TagSrv.scala
@@ -30,13 +30,8 @@ class TagSrv @Inject() (
 
   def freeTagColour: String = freeTagColourConfig.get
 
-  private val defaultColourConfig: ConfigItem[String, String] =
-    appConfig.item[String]("tags.defaultColour", "Default colour of the automatically created tags")
-
-  def defaultColour: String = defaultColourConfig.get
-
   private def freeTag(tagName: String)(implicit graph: Graph, authContext: AuthContext): Tag =
-    Tag(freeTagNamespace, tagName, None, None, defaultColour)
+    Tag(freeTagNamespace, tagName, None, None, freeTagColour)
 
   private def freeTagNamespace(implicit graph: Graph, authContext: AuthContext): String =
     s"_freetags_${organisationSrv.currentId(graph, authContext).value}"

diff --git a/thehive/app/org/thp/thehive/services/TaxonomySrv.scala b/thehive/app/org/thp/thehive/services/TaxonomySrv.scala
@@ -106,7 +106,7 @@ object TaxonomyOps {
         noFreetags.filter(_.organisations.get(authContext.organisation))
 
     def noFreetags: Traversal.V[Taxonomy] =
-      traversal.has(_.namespace, TextP.notStartingWith("_freetags"))
+      traversal.hasNot(_.namespace, TextP.startingWith("_freetags"))
 
     def freetags: Traversal.V[Taxonomy] =
       traversal.has(_.namespace, TextP.startingWith("_freetags"))