vignesh/dolibarr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Debug v24

Browse source
This commit is contained in:
Laurent Destailleur 2026-07-03 18:35:07 +02:00
parent 92f6c22280
commit c1bc4c7298
3 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
htdocs/core/class/html.formfile.class.php
View file

@ -1053,17 +1053,17 @@ class FormFile
// Show picto delete, print...
if ($delallowed || $printer || $morepicto) {
$$tmpout .= '<td class="right nowraponall">';
$tmpout .= '<td class="right nowraponall">';
if ($delallowed) {
$tmpurlsource = preg_replace('/#[a-zA-Z0-9_]*$/', '', $urlsource);
$tmpout .= '<a class="reposition" href="'.$tmpurlsource.((strpos($tmpurlsource, '?') === false) ? '?' : '&').'action='.urlencode($removeaction).'&token='.newToken().'&file='.urlencode($relativepath);
$tmpout .= '<a class="maginleftonly marginrightonly reposition" href="'.$tmpurlsource.((strpos($tmpurlsource, '?') === false) ? '?' : '&').'action='.urlencode($removeaction).'&token='.newToken().'&file='.urlencode($relativepath);
$tmpout .= ($param ? '&'.$param : '');
//$out.= '&modulepart='.$modulepart; // TODO obsolete ?
//$out.= '&urlsource='.urlencode($urlsource); // TODO obsolete ?
$tmpout .= '">'.img_picto($langs->trans("Delete"), 'delete').'</a>';
}
if ($printer) {
$tmpout .= '<a class="marginleftonly reposition" href="'.$urlsource.(strpos($urlsource, '?') ? '&' : '?').'action=print_file&token='.newToken().'&printer='.urlencode($modulepart).'&file='.urlencode($relativepath);
$tmpout .= '<a class="maginleftonly marginleftonly reposition" href="'.$urlsource.(strpos($urlsource, '?') ? '&' : '?').'action=print_file&token='.newToken().'&printer='.urlencode($modulepart).'&file='.urlencode($relativepath);
$tmpout .= ($param ? '&'.$param : '');
$tmpout .= '">'.img_picto($langs->trans("PrintFile", $relativepath), 'printer').'</a>';
}
@ -1125,7 +1125,7 @@ class FormFile
}
if ($headershown) {
// Affiche pied du tableau
// end of table
$out .= "</table>\n";
$out .= "</div>\n";
if ($genallowed) {

13
htdocs/core/lib/functions.lib.php
View file

@ -6862,9 +6862,10 @@ function img_searchclear($titlealt = 'default', $other = '')
* @param string $textfordropdown Show a text to click to dropdown the info box.
* @param string $picto '' or 'warning'
* @param string $textonpictotooltip Text to show in tooltip on picto
* @param string $cssfordropdown An additional css to avoid conflict to manage the dropdown if $textfordropdown is set
* @return string String with info text
*/
function info_admin($text, $infoonimgalt = 0, $nodiv = 0, $admin = '1', $morecss = 'hideonsmartphone', $textfordropdown = '', $picto = '', $textonpictotooltip = '')
function info_admin($text, $infoonimgalt = 0, $nodiv = 0, $admin = '1', $morecss = 'hideonsmartphone', $textfordropdown = '', $picto = '', $textonpictotooltip = '', $cssfordropdown = 'info_admin')
{
global $conf, $langs;
@ -6880,19 +6881,19 @@ function info_admin($text, $infoonimgalt = 0, $nodiv = 0, $admin = '1', $morecss
if ($picto == 'warning') {
$fa = 'exclamation-triangle';
}
$result = ($nodiv ? '' : '<div class="wordbreak ' . $class . ($morecss ? ' ' . $morecss : '') . ($textfordropdown ? ' hidden' : '') . '">');
$result = ($nodiv ? '' : '<div class="wordbreak ' . $class . ($cssfordropdown ? ' ' . $cssfordropdown : '') . ($morecss ? ' ' . $morecss : '') . ($textfordropdown ? ' hidden' : '') . '">');
$result .= img_picto(((string) $admin ? $langs->trans('InfoAdmin') : $langs->trans('Note')).($textonpictotooltip ? ' : '.$textonpictotooltip : ''), $fa);
$result .= ' ';
$result .= dol_escape_htmltag($text, 1, 0, 'div,span,b,br,a');
$result .= ($nodiv ? '' : '</div>');
if ($textfordropdown) {
$tmpresult = '<span class="' . $class . 'text opacitymedium cursorpointer">' . $langs->trans($textfordropdown) . ' ' . img_picto($langs->trans($textfordropdown), '1downarrow') . '</span>';
$tmpresult = '<span class="' . $class . ' '. $cssfordropdown.'text opacitymedium cursorpointer">' . $langs->trans($textfordropdown) . ' ' . img_picto($langs->trans($textfordropdown), '1downarrow') . '</span>';
$tmpresult .= '<script nonce="' . getNonce() . '" type="text/javascript">
jQuery(document).ready(function() {
jQuery(".' . $class . 'text").click(function() {
console.log("toggle text");
jQuery(".' . $class . '").toggle();
jQuery(".' . $cssfordropdown . 'text").click(function() {
console.log("toggle text of .'.$cssfordropdown.'");
jQuery(".' . $cssfordropdown . '").toggle().removeClass("hidden");
});
});
</script>';

4
htdocs/exports/export.php
View file

@ -1390,14 +1390,14 @@ if ($step == 5 && $datatoexport) {
$htmltabloflibs .= '</table><br>';
print '<br>';
print '<span class="opacitymedium">'.$form->textwithpicto($langs->trans("NowClickToGenerateToBuildExportFile"), $htmltabloflibs, 1, 'help', '', 0, 2, 'helphonformat').'</span>';
print '<div class="info"><span class="">'.$form->textwithpicto($langs->trans("NowClickToGenerateToBuildExportFile"), $htmltabloflibs, 1, 'help', '', 0, 2, 'helphonformat').'</span></div>';
//print $htmltabloflibs;
print '</div>';
if ($sqlusedforexport && $user->admin) {
print info_admin($langs->trans("SQLUsedForExport").':<br> '.$sqlusedforexport, 0, 0, '1', '', 'TechnicalInformation').'<br>';
print info_admin($langs->trans("SQLUsedForExport").':<br><span class="small">'.$sqlusedforexport.'</span>', 0, 0, 'info', '', 'TechnicalInformation').'<br>';
print '<br>';
}