Merge branch 'bug_24808/technique_markdown_documentation_are_no_longe…

…r_rendered_in_the_directive_page_pr' into branches/rudder/8.0
Normation · May 3, 2024 · 05c5311 · 05c5311
2 parents a5c9789 + 891a1fb
commit 05c5311
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 3 deletions.
diff --git a/...ources/rudder/rudder-core/src/main/scala/com/normation/rudder/ncf/TechniqueCompiler.scala b/...ources/rudder/rudder-core/src/main/scala/com/normation/rudder/ncf/TechniqueCompiler.scala
@@ -682,6 +682,7 @@ class WebappTechniqueCompiler(
           <MULTIINSTANCE>true</MULTIINSTANCE>
         } else NodeSeq.Empty
       }<DESCRIPTION>{technique.description}</DESCRIPTION>
+       <LONGDESCRIPTION>{technique.documentation}</LONGDESCRIPTION>
        <USEMETHODREPORTING>true</USEMETHODREPORTING>{agentSpecificSection}<SECTIONS>
         {reportingSection}{
         if (technique.parameters.nonEmpty) {

diff --git a/.../configuration-repository/expected-share/testing_variables_in_conditions/1.0/metadata.xml b/.../configuration-repository/expected-share/testing_variables_in_conditions/1.0/metadata.xml
@@ -2,6 +2,7 @@
   <POLICYGENERATION>separated-with-parameters</POLICYGENERATION>
   <MULTIINSTANCE>true</MULTIINSTANCE>
   <DESCRIPTION></DESCRIPTION>
+  <LONGDESCRIPTION></LONGDESCRIPTION>
   <USEMETHODREPORTING>true</USEMETHODREPORTING>
   <AGENT type="cfengine-community,cfengine-nova">
     <BUNDLES>

diff --git a/...sources/configuration-repository/techniques/ncf_techniques/technique_any/1.0/metadata.xml b/...sources/configuration-repository/techniques/ncf_techniques/technique_any/1.0/metadata.xml
@@ -2,6 +2,7 @@
   <POLICYGENERATION>separated-with-parameters</POLICYGENERATION>
   <MULTIINSTANCE>true</MULTIINSTANCE>
   <DESCRIPTION>This Technique exists only to see if Rudder creates Technique correctly.</DESCRIPTION>
+  <LONGDESCRIPTION></LONGDESCRIPTION>
   <USEMETHODREPORTING>true</USEMETHODREPORTING>
   <AGENT type="cfengine-community,cfengine-nova">
     <BUNDLES>

diff --git a/...sources/configuration-repository/techniques/ncf_techniques/technique_any/2.0/metadata.xml b/...sources/configuration-repository/techniques/ncf_techniques/technique_any/2.0/metadata.xml
@@ -2,6 +2,7 @@
   <POLICYGENERATION>separated-with-parameters</POLICYGENERATION>
   <MULTIINSTANCE>true</MULTIINSTANCE>
   <DESCRIPTION>This Technique exists only to see if Rudder creates Technique correctly.</DESCRIPTION>
+  <LONGDESCRIPTION></LONGDESCRIPTION>
   <USEMETHODREPORTING>true</USEMETHODREPORTING>
   <AGENT type="cfengine-community,cfengine-nova">
     <BUNDLES>

diff --git a/...s/configuration-repository/techniques/ncf_techniques/technique_by_Rudder/1.0/metadata.xml b/...s/configuration-repository/techniques/ncf_techniques/technique_by_Rudder/1.0/metadata.xml
@@ -2,6 +2,7 @@
   <POLICYGENERATION>separated-with-parameters</POLICYGENERATION>
   <MULTIINSTANCE>true</MULTIINSTANCE>
   <DESCRIPTION>This Technique exists only to see if Rudder creates Technique correctly.</DESCRIPTION>
+  <LONGDESCRIPTION></LONGDESCRIPTION>
   <USEMETHODREPORTING>true</USEMETHODREPORTING>
   <AGENT type="cfengine-community,cfengine-nova">
     <BUNDLES>

diff --git a/...es/rudder/rudder-web/src/main/webapp/secure/configurationManager/directiveManagement.html b/...es/rudder/rudder-web/src/main/webapp/secure/configurationManager/directiveManagement.html
@@ -58,20 +58,23 @@ <h1>
               The Directive <b class="directive">[Directive]</b> is based on following Technique:
             </div>
             <div ng-non-bindable id="isDisabled">[Disabled Technique]</div>
+            <div>
+              <h4>Description</h4>
+                <span ng-non-bindable id="techniqueDescription">[technique.description]</span>
+            </div>
             <div>
               <h4 style="margin-top:0;">Technique ID</h4>
               <span ng-non-bindable id="techniqueID">[technique.techniqueName]</span>
             </div>
             <div>
-              <h4 class="toggle-doc" onclick="$(this).toggleClass('doc-hidden')">Description<i class="fa fa-chevron-down"></i></h4>
+              <h4 class="toggle-doc" onclick="$(this).toggleClass('doc-hidden')">Documentation<i class="fa fa-chevron-down"></i></h4>
               <div class="markdown">
-                <span ng-non-bindable id="techniqueDescription">[technique.description]</span>
+                <span ng-non-bindable id="techniqueLongDescription">[technique.documentation]</span>
               </div>
             </div>
             <div class="groupDiv">
               <h4>Characteristics</h4>
               <ul>
-                <li ng-non-bindable id="techniqueLongDescription">[technique.longDescription]</li>
                 <li ng-non-bindable id="isSingle">[Unique Technique]</li>
               </ul>
             </div>