From 54eb89f08314e98691572f34fedbd862f811b6d5 Mon Sep 17 00:00:00 2001
From: Astor Bizard <astor.bizard@grenoble-inp.fr>
Date: Mon, 23 Mar 2020 15:56:31 +0100
Subject: [PATCH] Removed constraints for corrected files (no more matching
with required files).
---
forms/files.json.php | 4 ++++
forms/files.php | 5 +----
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/forms/files.json.php b/forms/files.json.php
index a944e196..c88ae292 100644
--- a/forms/files.json.php
+++ b/forms/files.json.php
@@ -60,6 +60,10 @@ try {
break;
case 'load' :
$fgm = $vpl->get_fgm($type);
+ if ($type == 'corrected' && empty($fgm->getfilelist())) {
+ // By default, load required files into corrected files.
+ $fgm = $vpl->get_fgm('required');
+ }
$outcome->response->files = mod_vpl_edit::filestoide( $fgm->getallfiles() );
break;
case 'resetfiles' :
diff --git a/forms/files.php b/forms/files.php
index d65879bf..93830a12 100644
--- a/forms/files.php
+++ b/forms/files.php
@@ -51,6 +51,7 @@ $options ['saved'] = true;
switch ($type) {
case 'required':
+ case 'corrected':
$options ['minfiles'] = 0;
$options ['maxfiles'] = $vpl->get_instance()->maxfiles;
break;
@@ -58,10 +59,6 @@ switch ($type) {
$options ['minfiles'] = $vpl->get_fgm('execution')->get_numstaticfiles();
$options ['maxfiles'] = 1000;
break;
- case 'corrected':
- $options ['minfiles'] = count($vpl->get_fgm('required')->getfilelist());
- $options ['maxfiles'] = $vpl->get_instance()->maxfiles;
- break;
case 'testcases':
$options ['minfiles'] = 1;
$options ['maxfiles'] = 1;
--
GitLab