From 1a67b4efeb83b822efc09d0f7f50d5098c3e3b04 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 8 Sep 2020 02:11:09 +0200 Subject: [PATCH] Debug --- htdocs/admin/syslog.php | 9 ++++----- htdocs/langs/en_US/admin.lang | 2 +- htdocs/ticket/class/ticket.class.php | 2 +- htdocs/ticket/list.php | 10 ++++------ 4 files changed, 10 insertions(+), 13 deletions(-) diff --git a/htdocs/admin/syslog.php b/htdocs/admin/syslog.php index f2d9e5aef60..079fb3a6052 100644 --- a/htdocs/admin/syslog.php +++ b/htdocs/admin/syslog.php @@ -158,11 +158,12 @@ if ($action == 'setlevel') } } + /* * View */ -llxHeader(); +llxHeader('', $langs->trans("SyslogSetup")); $form = new Form($db); @@ -170,8 +171,6 @@ $linkback = ''; -$def = array(); - $syslogfacility = $defaultsyslogfacility = dolibarr_get_const($db, "SYSLOG_FACILITY", 0); $syslogfile = $defaultsyslogfile = dolibarr_get_const($db, "SYSLOG_FILE", 0); @@ -188,7 +187,7 @@ if ($conf->global->MAIN_MODULE_MULTICOMPANY && $user->entity) //print "conf->global->MAIN_FEATURES_LEVEL = ".$conf->global->MAIN_FEATURES_LEVEL."

\n"; // Output mode -print load_fiche_titre($langs->trans("SyslogOutput")); +print load_fiche_titre($langs->trans("SyslogOutput"), '', ''); // Mode print '
'; @@ -260,7 +259,7 @@ print "
\n"; print '
'."\n\n"; -print load_fiche_titre($langs->trans("SyslogLevel")); +print load_fiche_titre($langs->trans("SyslogLevel"), '', ''); // Level print '
'; diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 36ee351e33d..15627a7e88b 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -1573,7 +1573,7 @@ YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant OnlyWindowsLOG_USER=Windows only supports LOG_USER CompressSyslogs=Compression and backup of debug log files (generated by module Log for debug) -SyslogFileNumberOfSaves=Log backups +SyslogFileNumberOfSaves=Number of backup logs to keep ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency ##### Donations ##### DonationsSetup=Donation module setup diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php index 56b882b2fb3..8404eef74d0 100644 --- a/htdocs/ticket/class/ticket.class.php +++ b/htdocs/ticket/class/ticket.class.php @@ -228,7 +228,7 @@ class Ticket extends CommonObject 'fk_user_create' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'Author', 'visible'=>1, 'enabled'=>1, 'position'=>15, 'notnull'=>1, 'css'=>'tdoverflowmax150 maxwidth150onsmartphone'), 'origin_email' => array('type'=>'mail', 'label'=>'OriginEmail', 'visible'=>-2, 'enabled'=>1, 'position'=>16, 'notnull'=>1, 'index'=>1, 'searchall'=>1, 'comment'=>"Reference of object", 'css'=>'tdoverflowmax150'), 'subject' => array('type'=>'varchar(255)', 'label'=>'Subject', 'visible'=>1, 'enabled'=>1, 'position'=>18, 'notnull'=>-1, 'searchall'=>1, 'help'=>"", 'css'=>'maxwidth200', 'autofocusoncreate'=>1), - 'type_code' => array('type'=>'varchar(32)', 'label'=>'Type', 'visible'=>1, 'enabled'=>1, 'position'=>20, 'notnull'=>-1, 'searchall'=>1, 'help'=>"", 'css'=>'maxwidth150'), + 'type_code' => array('type'=>'varchar(32)', 'label'=>'Type', 'visible'=>1, 'enabled'=>1, 'position'=>20, 'notnull'=>-1, 'help'=>"", 'css'=>'maxwidth150'), 'category_code' => array('type'=>'varchar(32)', 'label'=>'TicketCategory', 'visible'=>-1, 'enabled'=>1, 'position'=>21, 'notnull'=>-1, 'help'=>"", 'css'=>'maxwidth100'), 'severity_code' => array('type'=>'varchar(32)', 'label'=>'Severity', 'visible'=>1, 'enabled'=>1, 'position'=>20, 'notnull'=>-1, 'help'=>"", 'css'=>'maxwidth100'), 'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'visible'=>1, 'enabled'=>1, 'position'=>50, 'notnull'=>-1, 'index'=>1, 'searchall'=>1, 'help'=>"LinkToThirparty", 'css'=>'tdoverflowmax150 maxwidth150onsmartphone'), diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php index 6ea898e92db..ebab0b6566d 100644 --- a/htdocs/ticket/list.php +++ b/htdocs/ticket/list.php @@ -95,16 +95,14 @@ foreach ($object->fields as $key => $val) } // List of fields to search into when doing a "search in all" -$fieldstosearchall = array( - 's.nom'=>"ThirdParty", - 's.name_alias'=>"AliasNameShort", - 's.zip'=>"Zip", - 's.town'=>"Town", -); +$fieldstosearchall = array(); foreach ($object->fields as $key => $val) { if ($val['searchall']) $fieldstosearchall['t.'.$key] = $val['label']; } +$fieldstosearchall['s.name_alias']="AliasNameShort"; +$fieldstosearchall['s.zip']="Zip"; +$fieldstosearchall['s.town']="Town"; // Definition of fields for list $arrayfields = array();