Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Add new conf and update dolGetButtonAction function to display action buttons inline instead of into a dropdown (#29629)

Browse Source
This commit is contained in:
atm-etienne
2024-05-10 13:12:09 +02:00
committed by GitHub
parent 933e87ca81
commit a1d21836ce
2 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/commande/card.php
View File

@@ -3037,10 +3037,14 @@ if ($action == 'create' && $usercancreate) {
}
}*/
$actionButtonsParameters = [
"areDropdownButtons" => !getDolGlobalInt("MAIN_REMOVE_DROPDOWN_CREATE_BUTTONS_ON_ORDER")
];
if ($numlines > 0) {
print dolGetButtonAction('', $langs->trans("Create"), 'default', $arrayforbutaction, $object->id, 1);
print dolGetButtonAction('', $langs->trans("Create"), 'default', $arrayforbutaction, $object->id, 1, $actionButtonsParameters);
} else {
print dolGetButtonAction($langs->trans("ErrorObjectMustHaveLinesToBeValidated", $object->ref), $langs->trans("Create"), 'default', $arrayforbutaction, $object->id, 0);
print dolGetButtonAction($langs->trans("ErrorObjectMustHaveLinesToBeValidated", $object->ref), $langs->trans("Create"), 'default', $arrayforbutaction, $object->id, 0, $actionButtonsParameters);
}
// Set to shipped

20
htdocs/core/lib/functions.lib.php
View File

@@ -12095,7 +12095,7 @@ function dolGetButtonAction($label, $text = '', $actionType = 'default', $url =
{
global $hookmanager, $action, $object, $langs;
// If $url is an array, we must build a dropdown button
// If $url is an array, we must build a dropdown button or recursively iterate over each value
if (is_array($url)) {
// Loop on $url array to remove entries of disabled modules
foreach ($url as $key => $subbutton) {
@@ -12106,6 +12106,24 @@ function dolGetButtonAction($label, $text = '', $actionType = 'default', $url =
$out = '';
if (isset($params["areDropdownButtons"]) && $params["areDropdownButtons"] === false) {
foreach ($url as $button) {
if (!empty($button['lang'])) {
$langs->load($button['lang']);
}
$label = $langs->trans($button['label']);
$text = $button['text'] ?? '';
$actionType = $button['actionType'] ?? '';
$tmpUrl = DOL_URL_ROOT.$button['url'].(empty($params['backtopage']) ? '' : '&backtopage='.urlencode($params['backtopage']));
$id = $button['$id'] ?? '';
$userRight = $button['perm'] ?? 1;
$params = $button['$params'] ?? [];
$out .= dolGetButtonAction($label, $text, $actionType, $tmpUrl, $id, $userRight, $params);
}
return $out;
}
if (count($url) > 1) {
$out .= '<div class="dropdown inline-block dropdown-holder">';
$out .= '<a style="margin-right: auto;" class="dropdown-toggle classfortooltip butAction'.($userRight ? '' : 'Refused').'" title="'.dol_escape_htmltag($label).'" data-toggle="dropdown">'.($text ? $text : $label).'</a>';