diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 3e9faafbe9d..5b50958591f 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -1097,7 +1097,7 @@ if ($action == 'create')
if (!empty($conf->global->AGENDA_ENABLE_DONEBY))
{
print '
| '.$langs->trans("ActionDoneBy").' | ';
- print $form->select_dolusers(GETPOST("doneby") ?GETPOST("doneby") : (!empty($object->userdoneid) && $percent == 100 ? $object->userdoneid : 0), 'doneby', 1);
+ print $form->select_dolusers(GETPOSTISSET("doneby") ? GETPOST("doneby", 'int') : (!empty($object->userdoneid) && $percent == 100 ? $object->userdoneid : 0), 'doneby', 1);
print ' |
';
}
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index ee8b12f073f..4b8a64a0851 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1874,9 +1874,15 @@ class Form
if ($action != 'view')
{
$out .= '';
- $out .= '';
+ $out .= '';
$out .= $this->select_dolusers('', $htmlname, $show_empty, $exclude, $disabled, $include, $enableonly, $force_entity, $maxlength, $showstatus, $morefilter);
- $out .= ' ';
+ $out .= ' ';
$out .= '
';
}
diff --git a/htdocs/core/js/lib_notification.js.php b/htdocs/core/js/lib_notification.js.php
index a95e3556405..8ecca4da2df 100644
--- a/htdocs/core/js/lib_notification.js.php
+++ b/htdocs/core/js/lib_notification.js.php
@@ -77,10 +77,10 @@ if (!($_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root.'/' || $_SERVER['HTTP
data: { time_js_next_test: time_js_next_test, forcechecknow: 1, token: 'notrequired' },
dataType: "json",
success: function (result) {
- console.log(result);
+ //console.log(result);
var arrayofpastreminders = Object.values(result.pastreminders);
- console.log("arrayofpastreminders.length"+arrayofpastreminders.length);
if (arrayofpastreminders && arrayofpastreminders.length > 0) {
+ console.log("Retreived "+arrayofpastreminders.length+" reminders to do.");
var audio = null;
global->AGENDA_REMINDER_BROWSER_SOUND)) {
@@ -145,7 +145,7 @@ if (!($_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root.'/' || $_SERVER['HTTP
data: { time_js_next_test: time_js_next_test, token: 'notrequired' }
});
} else {
- console.log("No past reminder found, next try at "+time_js_next_test);
+ console.log("No reminder to do found, next search at "+time_js_next_test);
}
}
});
diff --git a/htdocs/langs/en_US/agenda.lang b/htdocs/langs/en_US/agenda.lang
index 4ab87aa8420..479155fb2a9 100644
--- a/htdocs/langs/en_US/agenda.lang
+++ b/htdocs/langs/en_US/agenda.lang
@@ -166,5 +166,4 @@ TimeType=Duration type
ReminderType=Callback type
AddReminder=Create an automatic reminder notification for this event
ErrorReminderActionCommCreation=Error creating the reminder notification for this event
-BrowserPush=Browser Notification
-EventReminder=Event Reminder
\ No newline at end of file
+BrowserPush=Browser Notification
\ No newline at end of file
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index c28280c8330..1096b9857f1 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -1099,3 +1099,4 @@ DateOfBirth=Date of birth
SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again.
UpToDate=Up-to-date
OutOfDate=Out-of-date
+EventReminder=Event Reminder
\ No newline at end of file