Fixes #24808: Technique markdown documentation are no longer rendered…

… in the directive page
Normation · Apr 29, 2024 · 3604634 · 3604634
1 parent 8e45aa1
commit 3604634
Show file tree

Hide file tree

Showing 2 changed files with 7 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/...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>