Skip to content

Commit 28e23c8

Browse files
committed
Fix bug in deletion threshold selection value.
issue: documentacao-e-tarefas/desenvolvimento_e_infra#646 Signed-off-by: iudi <iudi@lepidus.com.br> Signed-off-by: jhon <jhon@lepidus.com.br>
1 parent d4a18ce commit 28e23c8

2 files changed

Lines changed: 5 additions & 7 deletions

File tree

form/DeleteIncompleteSubmissionsSettingsForm.inc.php

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ public function fetch($request, $template = null, $display = false)
3838
$templateMgr = TemplateManager::getManager($request);
3939
$templateMgr->assign('pluginName', $this->plugin->getName());
4040
$templateMgr->assign('applicationName', Application::get()->getName());
41-
$templateMgr->assign('thresholdValues', range(15, 60));
41+
$templateMgr->assign('thresholdValues', range(0, 60));
42+
$templateMgr->assign('defaultThreshold', 15);
4243

4344
return parent::fetch($request, $template, $display);
4445
}
@@ -50,13 +51,12 @@ public function execute(...$functionArgs)
5051

5152
$deletionThreshold = $this->getData('deletionThreshold');
5253

53-
$numDeleted = $this->deleteIncompleteSubmissions($deletionThreshold);
54+
$this->deleteIncompleteSubmissions($deletionThreshold);
5455
parent::execute(...$functionArgs);
5556
}
5657

57-
private function deleteIncompleteSubmissions(int $deletionThreshold): int
58+
private function deleteIncompleteSubmissions(int $deletionThreshold): void
5859
{
59-
$deleted = 0;
6060
$submissionService = Services::get('submission');
6161
$submissions = $submissionService->getMany([
6262
'contextId' => $this->contextId, 'isIncomplete' => true, 'daysInactive' => $deletionThreshold
@@ -65,11 +65,9 @@ private function deleteIncompleteSubmissions(int $deletionThreshold): int
6565
foreach ($submissions as $submission) {
6666
try {
6767
$submissionService->delete($submission);
68-
$deleted++;
6968
} catch (\Throwable $th) {
7069
error_log('The submission ' . $submission->getId() . ' was not deleted. Reason:' . $th->getMessage());
7170
}
7271
}
73-
return $deleted;
7472
}
7573
}

templates/settingsForm.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
{fbvFormArea id="deleteIncompleteSubmissionsSettingsFormArea"}
1717

1818
{fbvFormSection list="true"}
19-
{fbvElement type="select" name="deletionThreshold" id="deletionThreshold" from=$thresholdValues label="plugins.generic.deleteIncompleteSubmissions.deletion.threshold" translate="0" size=$fbvStyles.size.SMALL}
19+
{fbvElement type="select" name="deletionThreshold" id="deletionThreshold" from=$thresholdValues selected=$defaultThreshold label="plugins.generic.deleteIncompleteSubmissions.deletion.threshold" translate="0" size=$fbvStyles.size.SMALL}
2020

2121
{fbvFormButtons id="deleteIncompleteSubmissionsSettingsFormSubmit" submitText="common.delete"}
2222

0 commit comments

Comments
 (0)