From ff3729efbd79fec986425b363ea0e0f05f9819fc Mon Sep 17 00:00:00 2001 From: Carsten Schmitz Date: Thu, 6 Aug 2020 11:00:19 +0200 Subject: [PATCH] Fixed issue #16561: Batch-editing tokens does not set fields properly if "completed", "invitation sent" or "reminder sent" is set to No. Fixed issue: When editing a token the date/time format is not properly displayed and handled on "invitation sent" or "reminder sent" field and thus wrong values are saved --- application/controllers/admin/tokens.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/application/controllers/admin/tokens.php b/application/controllers/admin/tokens.php index d5d96acb708..b8ac1f32804 100644 --- a/application/controllers/admin/tokens.php +++ b/application/controllers/admin/tokens.php @@ -776,10 +776,12 @@ public function edit($iSurveyId, $iTokenId, $ajax = false) } // completed - if (trim($request->getPost('completed')) == 'N') { + if (trim($request->getPost('completed')) == 'N' || trim($request->getPost('completed')) == '') { $_POST['completed'] = 'N'; + } elseif (trim($request->getPost('completed')) == 'Y') { + $_POST['completed'] = 'Y'; } else { - $datetimeobj = new Date_Time_Converter(trim($request->getPost('completed')), $dateformatdetails['phpdate'] . ' H:i'); + $datetimeobj = new Date_Time_Converter(trim($request->getPost('completed')), $dateformatdetails['phpdate'] . ' H:i'); $_POST['completed'] = $datetimeobj->convert('Y-m-d H:i'); }