[TikiWiki-commits] [Git][tikiwiki/tiki][30.x] [FIX] Modules Admin: Assigning a new module has UI problems

luci pushed to branch 30.x at Tiki Wiki CMS Groupware / Tiki


Commits:
50d6dc16 by NasserNgandu at 2026-04-14T19:46:07+00:00
[FIX] Modules Admin: Assigning a new module has UI problems
---
* [FIX] Modules Admin: Assigning a new module has UI problems
---
* [FIX] Fixed behavior of the Preview button.

* [FIX] Renaming the variable  to .

* [FIX] Assigning a new module has UI problems.

See merge request tikiwiki/tiki!9817

See merge request tikiwiki/tiki!10022

- - - - -


4 changed files:

- lib/smarty_tiki/BlockHandler/Tab.php
- lib/smarty_tiki/BlockHandler/Tabset.php
- templates/admin_modules_form.tpl
- templates/tiki-admin_modules.tpl


Changes:

=====================================
lib/smarty_tiki/BlockHandler/Tab.php
=====================================
@@ -36,7 +36,7 @@ class Tab extends Base
 {
     public function handle($params, $content, Template $template, &$repeat)
     {
-        global $prefs, $smarty_tabset, $cookietab, $smarty_tabset_i_tab, $smarty_tabset_name;
+        global $prefs, $smarty_tabset, $cookietab, $cookietabTabset, $smarty_tabset_i_tab, $smarty_tabset_name;
         $smarty = \TikiLib::lib('smarty');
         if ($repeat) {
             return '';
@@ -57,7 +57,7 @@ class Tab extends Base
                 }
 
                 $id = $id = "content$name-{$params['key']}";
-                $active = ($smarty_tabset_i_tab == $cookietab) ? 'active' : '';
+                $active = ($smarty_tabset_i_tab == ($cookietabTabset ?? $cookietab)) ? 'active' : '';
                 $def = [
                     'label' => $params['name'],
                     'id' => $id,


=====================================
lib/smarty_tiki/BlockHandler/Tabset.php
=====================================
@@ -32,7 +32,7 @@ class Tabset extends Base
 {
     public function handle($params, $content, Template $template, &$repeat)
     {
-        global $prefs, $smarty_tabset_name, $smarty_tabset, $smarty_tabset_i_tab, $cookietab;
+        global $prefs, $smarty_tabset_name, $smarty_tabset, $smarty_tabset_i_tab, $cookietab, $cookietabTabset;
         $smarty = \TikiLib::lib('smarty');
         if ($smarty->getTemplateVars('print_page') == 'y' || $prefs['layout_tabs_optional'] === 'n') {
             $params['toggle'] = 'n';
@@ -56,7 +56,7 @@ class Tabset extends Base
 
             // If the tabset specifies the tab, override any kind of memory but only if not doing "no tabs" mode
             if (isset($params['cookietab']) && $cookietab !== 'n') {
-                $cookietab = $params['cookietab'];
+                $cookietabTabset = $params['cookietab'];
             }
 
             $smarty_tabset_i_tab = 1;
@@ -66,6 +66,8 @@ class Tabset extends Base
 
             return '';
         } else {
+            $tabsetCookietab = isset($params['cookietab']) && $cookietab !== 'n' ? $cookietabTabset : $cookietab;
+            $cookietabTabset = null;
             $content = trim($content);
             if (empty($content)) {
                 return '';
@@ -80,14 +82,14 @@ class Tabset extends Base
             //closing
             if ($prefs['feature_tabs'] == 'y') {
                 if (empty($params['toggle']) || $params['toggle'] != 'n') {
-                    if ($cookietab == 'n') {
+                    if ($tabsetCookietab == 'n') {
                         $button_params['_text'] = tra('Tab View');
                     } else {
                         $button_params['_text'] = tra('No Tabs');
                     }
                     $button_params['_size'] = 'mini';
                     $button_params['_auto_args'] = '*';
-                    $button_params['_onclick'] = "setCookie('$smarty_tabset_name','" . ($cookietab == 'n' ? 1 : 'n') . "', 'tabs', 'session', " . "window.tikiCookieConstants.BUILTIN_COOKIE_CATEGORY_FUNCTIONAL);";
+                    $button_params['_onclick'] = "setCookie('$smarty_tabset_name','" . ($tabsetCookietab == 'n' ? 1 : 'n') . "', 'tabs', 'session', " . "window.tikiCookieConstants.BUILTIN_COOKIE_CATEGORY_FUNCTIONAL);";
                     $button_params['_class'] = 'btn-sm'; // btn-secondary removed because btn-primary is also being applied somehow.
                     $notabs = smarty_function_button($button_params, $smarty->getEmptyInternalTemplate());
                     $notabs = "<div class='float-end'>$notabs</div>";
@@ -98,7 +100,7 @@ class Tabset extends Base
             } else {
                 return $content;
             }
-            if ($cookietab == 'n') {
+            if ($tabsetCookietab == 'n') {
                 return $ret . $notabs . $content;
             }
 


=====================================
templates/admin_modules_form.tpl
=====================================
@@ -13,8 +13,8 @@
     {if isset($assign_info)}<div class="description form-text">{$assign_info.description}{if isset($assign_info.documentation)} {help url=$assign_info.documentation}{/if}</div>{/if}
 </div>
 <div id="module_params">
-{tabset name="module_params{$assign_name}" toggle="n"}
-    {if !empty($assign_name)}
+{if !empty($assign_name)}
+    {tabset name="module_params{$assign_name}" toggle="n" cookietab=1}
         {tab name="{tr}Basic{/tr}" key=basic}
             <fieldset id="param_section_basic">
                 <div class="clearfix mb-3">
@@ -154,11 +154,11 @@
                     {self_link um_edit=$assign_name cookietab="2" _anchor="editcreate"}{tr}Edit custom module{/tr} {icon name="next"}{/self_link}
                 </div>
             {/if}
-        <div class="d-flex justify-content-center submit-container">
-            <input type="submit" class="btn btn-secondary me-2" name="preview" value="{tr}Preview{/tr}" onclick="needToConfirm=false;">
+        <div class="d-flex justify-content-center submit-container mt-2">
+            {button edit_assign=0 cookietab=2 _type="secondary" _class="me-2" href="#assign" _auto_args="edit_assign,cookietab" _text="{tr}Preview{/tr}"}
             <input type="submit" class="btn btn-primary" name="assign" value="{tr}Assign{/tr}" onclick="needToConfirm=false;">
         </div>
-    {/if}
+    {/tabset}
+{/if}
 
-{/tabset}
 </div>


=====================================
templates/tiki-admin_modules.tpl
=====================================
@@ -54,7 +54,7 @@
         {/if}
         <h2>{tr}Assigned Modules{/tr}</h2>
         <div class="mb-4">
-            {button edit_assign=0 cookietab=1 href="#assign" _auto_args="edit_assign,cookietab" _text="{tr}Assign new module{/tr}"}
+            {button edit_assign=0 cookietab=2 href="#assign" _auto_args="edit_assign,cookietab" _text="{tr}Assign new module{/tr}"}
         </div>
 
         <div id="assigned_modules">



View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/50d6dc162e7174ebbffa84b56737e224b25639cd

-- 
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/50d6dc162e7174ebbffa84b56737e224b25639cd
You're receiving this email because of your account on gitlab.com. Manage all notifications: https://gitlab.com/-/profile/notifications | Help: https://gitlab.com/help

_______________________________________________
TikiWiki-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs