Merge pull request #173 from tomolimo/5.0/bugfixes

Fix dynaform preview that did not create new tab
tomolimo · Nov 23, 2023 · 7a91a51 · 7a91a51
2 parents b009029 + 5851f0f
commit 7a91a51
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/js/cases.js b/js/cases.js
@@ -28,18 +28,21 @@ along with this plugin. If not, see <http://www.gnu.org/licenses/>.
 glpi_pm = {
    add_tab_panel: function (name, title, html){
       //debugger ;
-      var loctabs = $('#tabspanel').next('div[id^=tabs]');
+      var loctabs = $('#tabspanel');
       if( !loctabs[0].children[name] ) { // panel is not yet existing, create one
-         if( loctabs.find('a[href=\"#'+name+'\"]').length == 0 ) {
-            loctabs.find('ul').append( '<li><a href=\'#' + name + '\'>' + title + '</a></li>' );
+         if (loctabs.find('a[data-bs-target=\"#'+name+'\"]').length == 0 ) {
+            loctabs.append("<li class='nav-item ms-0'><a class='nav-link justify-content-between pe-1' href='#' data-bs-toggle='tab' title='" + title + "' data-bs-target='#" + name + "'>" + title + "</a></li>" );
          }
-
-         loctabs.append( '<div id=\'' + name + '\'>' + html + '</div>');
-         loctabs.tabs('refresh'); // to show the panel
+         var select = loctabs.next('select');
+         select.append("<option value='" + (parseInt(select.children().last().val()) + 1) + "'>" + title + "</option >")
+         var tabcontentdiv = select.next('div');
+         tabcontentdiv.append("<div class='tab-pane fade' role='tabpanel' id='" + name + "'>" + html + "</div>");
+         $("a[data-bs-target='#" +name +"']").tab("show");
+         //tabcontentdiv.tabs('refresh'); // to show the panel
       } 
       // activate it
-      var tabIndex = loctabs.find('a[href=\"#'+name+'\"]').parent().index();
-      loctabs.tabs( 'option', 'active', tabIndex) ; // to activate it
+     //var tabIndex = loctabs.find('a[href=\"#'+name+'\"]').parent().index();
+     // loctabs.tabs( 'option', 'active', tabIndex) ; // to activate it
    },
 
 

diff --git a/processmaker.xml b/processmaker.xml
@@ -45,7 +45,7 @@
          <compatibility>9.5</compatibility>
       </version>
       <version>
-         <num>5.0.2</num>
+         <num>5.0.3</num>
          <compatibility>10.0</compatibility>
       </version>
    </versions>

diff --git a/setup.php b/setup.php
@@ -25,7 +25,7 @@
 along with this plugin. If not, see <http://www.gnu.org/licenses/>.
 --------------------------------------------------------------------------
  */
-define('PROCESSMAKER_VERSION', '5.0.2');
+define('PROCESSMAKER_VERSION', '5.0.3');
 
 // Minimal GLPI version, inclusive
 define('PLUGIN_PROCESSMAKER_MIN_GLPI', '10.0');