Merge branch 'bug_20087/adapt_plugin_to_changes_in_3783_to_show_direc…

…tive_change_based_on_deleted_technique_pr' into branches/rudder/6.1
Normation · Oct 17, 2021 · 3020ff4 · 3020ff4
2 parents d76fc02 + 5a599ba
commit 3020ff4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.../main/scala/com/normation/plugins/changevalidation/snippet/ChangeRequestChangesForm.scala b/.../main/scala/com/normation/plugins/changevalidation/snippet/ChangeRequestChangesForm.scala
@@ -506,7 +506,7 @@ class ChangeRequestChangesForm(
         diff          : ModifyDirectiveDiff
       , directive     : Directive
       , techniqueName : TechniqueName
-      , rootSection   : SectionSpec
+      , rootSection   : Option[SectionSpec]
   ) = {
 
     val policyMode = directive.policyMode match {
@@ -530,7 +530,7 @@ class ChangeRequestChangesForm(
 
       "#parameters"       #> {
         implicit val fun = (section:SectionVal) => xmlPretty.format(SectionVal.toXml(section))
-        val parameters = <pre>{fun(SectionVal.directiveValToSectionVal(rootSection,directive.parameters))}</pre>
+        val parameters = <pre>{rootSection.map { section => fun(SectionVal.directiveValToSectionVal(section,directive.parameters))}.getOrElse(NodeSeq.Empty)  }</pre>
         diff.modParameters.map(displayFormDiff(_,"parameters")).getOrElse(parameters)
       }
     ) (DirectiveXML)

diff --git a/main-build.conf b/main-build.conf
@@ -23,5 +23,5 @@ lib-common-private=1.3
 
 # Version of Rudder used to build the plugin.
 # It defined the API/ABI used and it is important for binary compatibility
-rudder-build-version=6.1.0
+rudder-build-version=6.1.17
 rudder-build-version-nightly=6.1.17-SNAPSHOT