Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-06 00:53:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source 
Conflicts:
	htdocs/langs/en_US/admin.lang
This commit is contained in:
Laurent Destailleur
2022-05-03 13:05:51 +02:00
parent 6656ccdb0f 9f379dfcf4
commit 51e9a7c251
5 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
htdocs/admin/debugbar.php
View File

@@ -93,15 +93,17 @@ print '<td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td
print '<td class="right"><input type="submit" class="button button-edit" '.$option.' value="'.$langs->trans("Modify").'"></td>';
print "</tr>\n";
print '<tr class="oddeven"><td>'.$langs->trans("DEBUGBAR_LOGS_LINES_NUMBER").'</td>';
print '<td colspan="2"><input type="text" class="flat" name="DEBUGBAR_LOGS_LINES_NUMBER" value="'.(empty($conf->global->DEBUGBAR_LOGS_LINES_NUMBER) ? 250 : $conf->global->DEBUGBAR_LOGS_LINES_NUMBER).'">'; // This slow seriously output
print ' '.$langs->trans("WarningValueHigherSlowsDramaticalyOutput");
print '<tr class="oddeven"><td class="nowrap">'.$langs->trans("DEBUGBAR_USE_LOG_FILE").'</td>';
print '<td>';
print $form->selectyesno('DEBUGBAR_USE_LOG_FILE', $conf->global->DEBUGBAR_USE_LOG_FILE, 1);
print '</td><td>';
print '<span class="opacitymedium"> '.$langs->trans("UsingLogFileShowAllRecordOfSubrequestButIsSlower").'</span>';
print '</td></tr>';
print '<tr class="oddeven"><td>'.$langs->trans("DEBUGBAR_USE_LOG_FILE").'</td>';
print '<td colspan="2">';
print $form->selectyesno('DEBUGBAR_USE_LOG_FILE', $conf->global->DEBUGBAR_USE_LOG_FILE, 1);
print ' '.$langs->trans("UsingLogFileShowAllRecordOfSubrequestButIsSlower");
print '<tr class="oddeven"><td class="nowrap">'.$langs->trans("DEBUGBAR_LOGS_LINES_NUMBER").'</td>';
print '<td><input type="text" class="flat width75" name="DEBUGBAR_LOGS_LINES_NUMBER" value="'.(empty($conf->global->DEBUGBAR_LOGS_LINES_NUMBER) ? 250 : $conf->global->DEBUGBAR_LOGS_LINES_NUMBER).'">'; // This slow seriously output
print '</td><td>';
print '<span class="opacitymedium">'.$langs->trans("WarningValueHigherSlowsDramaticalyOutput").'</span>';
print '</td></tr>';
print '</table>';

2
htdocs/core/js/lib_head.js.php
View File

@@ -990,6 +990,7 @@ function document_preview(file, type, title)
img.src = file;
}
function show_preview(mode) {
/* console.log("mode="+mode+" file="+file+" type="+type+" width="+width+" height="+height); */
var newElem = '<object name="objectpreview" data="'+file+'" type="'+type+'" width="'+object_width+'" height="'+object_height+'" param="noparam"></object>';
@@ -1004,6 +1005,7 @@ function document_preview(file, type, title)
}
$("#dialogforpopup").html(newElem);
$("#dialogforpopup").dialog({
closeOnEscape: true,
resizable: true,

4
htdocs/core/modules/DolibarrModules.class.php
View File

@@ -826,7 +826,9 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
}
/**
* Tells if module is core or external
* Tells if module is core or external.
* 'dolibarr' and 'dolibarr_deprecated' is core
* 'experimental' and 'development' is core
*
* @return string 'core', 'external' or 'unknown'
*/

2
htdocs/debugbar/class/DataCollector/DolLogsCollector.php
View File

@@ -73,7 +73,7 @@ class DolLogsCollector extends MessagesCollector
{
global $conf;
$uselogfile = getDolGlobalInt('DEBUGBAR_USE_LOGFILE');
$uselogfile = getDolGlobalInt('DEBUGBAR_USE_LOG_FILE');
if ($uselogfile) {
$this->getStorageLogs($this->path);

2
htdocs/langs/en_US/admin.lang
View File

@@ -2250,3 +2250,5 @@ ExportUseLowMemoryModeHelp=Use the low memory mode to execute the exec of the du
ShowQuickAddLink=Show a button to quickly add an element in top right menu
HashForPing=Hash used for ping
ReadOnlyMode=Is instance in "Read Only" mode
DEBUGBAR_USE_LOG_FILE=Use the <b>dolibarr.log</b> file to trap Logs
UsingLogFileShowAllRecordOfSubrequestButIsSlower=Use the dolibarr.log file to trap Logs instead of live memory catching. It allows to catch all logs instead of only log of current process (so including the one of ajax subrequests pages) but will make your instance very very slow. Not recommended.