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

Fix tz of message on popup

Browse Source
This commit is contained in:
Laurent Destailleur
2022-01-17 19:07:02 +01:00
parent 0e44bfd4e4
commit a072c8911a
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/ajax/check_notifications.php
View File

@@ -170,8 +170,8 @@ if (empty($_SESSION['auto_check_events_not_before']) || $time >= $_SESSION['auto
$event['code'] = $obj->code; $event['code'] = $obj->code;
$event['label'] = $obj->label; $event['label'] = $obj->label;
$event['location'] = $obj->location; $event['location'] = $obj->location;
$event['reminder_date_formated'] = dol_print_date($db->jdate($obj->dateremind), 'standard'); $event['reminder_date_formated'] = dol_print_date($db->jdate($obj->dateremind), 'standard', 'tzuser');
$event['event_date_start_formated'] = dol_print_date($db->jdate($obj->datep), 'standard'); $event['event_date_start_formated'] = dol_print_date($db->jdate($obj->datep), 'standard', 'tzuser');
$eventfound[$obj->id_agenda] = $event; $eventfound[$obj->id_agenda] = $event;
} }

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

@@ -64,7 +64,7 @@ print "jQuery(document).ready(function () {\n";
//print " console.log('referrer=".dol_escape_js($_SERVER['HTTP_REFERER'])."');\n"; //print " console.log('referrer=".dol_escape_js($_SERVER['HTTP_REFERER'])."');\n";
print ' var nowtime = Date.now();'; print ' var nowtime = Date.now();';
print ' var time_auto_update = '.$conf->global->MAIN_BROWSER_NOTIFICATION_FREQUENCY.';'."\n"; // Always defined print ' var time_auto_update = '.max(1, getDolGlobalInt('MAIN_BROWSER_NOTIFICATION_FREQUENCY')).';'."\n"; // Always defined
print ' var time_js_next_test;'."\n"; print ' var time_js_next_test;'."\n";
?> ?>