From fa18f958d76bb04128ae4de8301a41be53ba73ae Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 12 Aug 2023 13:08:36 +0200 Subject: [PATCH] Debug v18 --- htdocs/admin/system/modules.php | 51 ++++++++++++++++++++++++--------- 1 file changed, 38 insertions(+), 13 deletions(-) diff --git a/htdocs/admin/system/modules.php b/htdocs/admin/system/modules.php index 6ea79cf00eb..9bc2f5d8dc5 100644 --- a/htdocs/admin/system/modules.php +++ b/htdocs/admin/system/modules.php @@ -220,15 +220,27 @@ print ''.$langs->trans("ToActivateModule").'' print '
'; print '
'; +$mode = ''; +$arrayofmassactions = array(); + $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; -$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields +$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields +$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); + +$moreforfilter = ''; print '
'; -print ''; +print '
'."\n"; // Lines with input filters print ''; - +// Action column +if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) { + print ''; +} if ($arrayfields['name']['checked']) { print ''; } - -print ''; - +// Action column +if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) { + print ''; +} print ''; print ''; - +// Action column +if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) { + print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch actioncolumn'); +} if ($arrayfields['name']['checked']) { print_liste_field_titre($arrayfields['name']['label'], $_SERVER["PHP_SELF"], "name", "", "", "", $sortfield, $sortorder); } @@ -283,8 +299,10 @@ if ($arrayfields['module_position']['checked']) { $parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder); $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook print $hookmanager->resPrint; - -print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch '); +// Action column +if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) { + print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch '); +} print ''; // sort list @@ -318,6 +336,10 @@ if ($sortfield == "name" && $sortorder == "asc") { foreach ($moduleList as $module) { print ''; + // Action column + if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) { + print ''; + } if ($arrayfields['name']['checked']) { print ''; } - print ''; + // Action column + if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) { + print ''; + } print ''; }
'; + $searchpicto = $form->showFilterButtons(); + print $searchpicto; + print ''; print ''; @@ -253,16 +265,20 @@ if ($arrayfields['module_position']['checked']) { print ''; print ''; -$searchpicto = $form->showFilterButtons(); -print $searchpicto; -print ''; + $searchpicto = $form->showFilterButtons(); + print $searchpicto; + print '
'; @@ -358,7 +380,10 @@ foreach ($moduleList as $module) { print ''.$module->module_position.'