Fixes #23646: Remove OpenSCAP page from plugin

Normation · Oct 25, 2023 · 3c08b12 · 3c08b12
1 parent 3227b01
commit 3c08b12
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 56 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,10 +1,6 @@
 
 def failedBuild = false
-<<<<<<< HEAD
 def version = "8.0"
-=======
-def version = "8.0-next"
->>>>>>> 8.0-next
 
 def changeUrl = env.CHANGE_URL
 def blueUrl = "${env.JOB_DISPLAY_URL}"

diff --git a/openscap/src/main/resources/template/OpenScapPoliciesManagement.html b/openscap/src/main/resources/template/OpenScapPoliciesManagement.html
diff --git a/...cap/src/main/scala/com/normation/plugins/openscappolicies/OpenscapPoliciesPluginDef.scala b/...cap/src/main/scala/com/normation/plugins/openscappolicies/OpenscapPoliciesPluginDef.scala
@@ -63,17 +63,4 @@ class OpenscapPoliciesPluginDef(override val status: PluginStatus) extends Defau
   }
 
   val configFiles = Seq()
-
-  override def pluginMenuEntry: List[(Menu, Option[String])] = {
-    (
-      (Menu("openScapPolicies", <span>OpenSCAP policies</span>) /
-      "secure" / "plugins" / "OpenScapPolicies"
-      >> LocGroup("pluginsGroup")
-      >> TestAccess(() => Boot.userIsAllowed("/secure/index", Administration.Read))
-      >> Template(() =>
-        ClasspathTemplates("template" :: "OpenScapPoliciesManagement" :: Nil) openOr <div>Template not found</div>
-      )).toMenu,
-      None
-    ) :: Nil
-  }
 }