[TikiWiki-commits] [Git][tikiwiki/tiki][27.x] [BP][ENH][FIX] Custom Modules: Display parameters form instead of plain old...
"luci \(@luciash\) via TikiWiki-cvs" <[email protected]>
| Newsgroups | gmane.comp.cms.tiki.cvs |
|---|---|
| Message-ID | <69ba75abb6453_3b18d0e4126a3@gitlab-sidekiq-low-urgency-cpu-bound-v2-6fb4d774c4-9k2l8.mail> |
luci pushed to branch 27.x at Tiki Wiki CMS Groupware / Tiki
Commits:
8336b3ea by Landry Bitege at 2026-03-18T09:44:01+00:00
[BP][ENH][FIX] Custom Modules: Display parameters form instead of plain old...
---
* [BP][ENH][FIX] Custom Modules: Display parameters form instead of plain old textarea for custom (user) modules too
---
* [ENH][FIX] Custom Modules: Display parameters form instead of plain old textarea for custom (user) modules too
---
* [FIX] Custom Modules: Display parameters form for custom modules when assigning
See merge request tikiwiki/tiki!9658
(cherry picked from commit 53f9afc786f6b761a9ca153be776828c81c8b7a0)
See merge request tikiwiki/tiki!9744
(cherry picked from commit 04d7f3c7a1f73c4e93f8ff75cc31e317db33b7f4)
See merge request tikiwiki/tiki!9780
- - - - -
2 changed files:
- templates/admin_modules_form.tpl
- tiki-admin_modules.php
Changes:
=====================================
templates/admin_modules_form.tpl
=====================================
@@ -14,7 +14,7 @@
</div>
<div id="module_params">
{if !empty($assign_name)}
- {if isset($assign_info.type) and $assign_info.type eq 'function'}
+ {if isset($assign_info.params) and !empty($assign_info.params)}
<ul>
<li><a href="#param_section_basic">{tr}Basic{/tr}</a></li>
{foreach from=$assign_info.params key=sect item=params}
@@ -92,7 +92,7 @@
</div>
{/if}
</fieldset>
- {if isset($assign_info.type) and $assign_info.type eq 'function'}
+ {if isset($assign_info.params) and !empty($assign_info.params)}
{foreach from=$assign_info.params key=sect item=params}
<fieldset id="param_section_{$sect}">
{foreach from=$params key=name item=param}
=====================================
tiki-admin_modules.php
=====================================
@@ -129,18 +129,17 @@ if (! empty($_REQUEST['edit_assign'])) {
}
$modinfo = $modlib->get_module_info($info['name']);
- if ($modinfo['type'] != 'function') {
- $smarty->assign_by_ref('assign_rows', $info['rows']);
- $smarty->assign_by_ref('assign_params', $info['params']); // For old-style (user) modules
- } else {
- if (empty($info['params'])) {
- $info['params'] = [];
- }
- $modlib->dispatchValues($info['params'], $modinfo['params']);
- if (isset($modinfo['params']['rows'])) {
- $modinfo['params']['rows']['value'] = $info['rows'];
+ $params = [];
+
+ if (! empty($info['params'])) {
+ if (is_array($info['params'])) {
+ $params = $info['params'];
+ } else {
+ parse_str($info['params'], $params);
}
}
+
+ $modlib->dispatchValues($params, $modinfo['params']);
$smarty->assign('assign_info', $modinfo);
}
//post is used for preview because there is another submit item on the form requiring it
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/8336b3eab35e0d63fb1cfdca525e997de8a8d4f4
--
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/8336b3eab35e0d63fb1cfdca525e997de8a8d4f4
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