Fix on demand JS when calling from modal; closes #7075

Author: trasher

front/dropdown.common.form.php

@@ -121,7 +121,13 @@
    }
 
 } else if (isset($_GET['_in_modal'])) {
-   Html::popHeader($dropdown->getTypeName(1), $_SERVER['PHP_SELF']);
+   Html::popHeader(
+      $dropdown->getTypeName(1),
+      $_SERVER['PHP_SELF'],
+      false,
+      $dropdown->first_level_menu,
+      $dropdown->second_level_menu, $dropdown->getType()
+   );
    $dropdown->showForm($_GET["id"]);
    Html::popFooter();
 

inc/commondropdown.class.php

@@ -46,7 +46,7 @@ abstract class CommonDropdown extends CommonDBTM {
 
    //Menu & navigation
    public $first_level_menu  = "config";
-   public $second_level_menu = "CommonDropdown";
+   public $second_level_menu = "commondropdown";
    public $third_level_menu  = "";
 
    public $display_dropdowntitle  = true;

inc/html.class.php

@@ -1544,7 +1544,7 @@ static function header($title, $url = '', $sector = "none", $item = "none", $opt
 
       // If in modal : display popHeader
       if (isset($_REQUEST['_in_modal']) && $_REQUEST['_in_modal']) {
-         return self::popHeader($title, $url);
+         return self::popHeader($title, $url, false, $sector, $item, $option);
       }
       // Print a nice HTML-head for every page
       if ($HEADER_LOADED) {
@@ -1624,7 +1624,7 @@ static function header($title, $url = '', $sector = "none", $item = "none", $opt
    static function footer($keepDB = false) {
       global $CFG_GLPI, $FOOTER_LOADED, $TIMER_DEBUG;
 
-      // If in modal : display popHeader
+      // If in modal : display popFooter
       if (isset($_REQUEST['_in_modal']) && $_REQUEST['_in_modal']) {
          return self::popFooter();
       }