moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-07 01:46:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-46600_import_failed_26' of git://github.com/andyjdavis/moodle into MOODLE_26_STABLE

Browse source
This commit is contained in:
Marina Glancy 2014-08-12 15:02:51 +08:00
commit a17f12e801
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
grade/import/csv/index.php
View file

@ -299,7 +299,7 @@ if ($formdata = $mform2->get_data()) {
// had to pick mapping // had to pick mapping
$status = false; $status = false;
import_cleanup($importcode); import_cleanup($importcode);
echo $OUTPUT->notification(get_string('importfailed', 'grades')); // Relying on the default import failed message below.
break 3; break 3;
} }
@ -320,7 +320,7 @@ if ($formdata = $mform2->get_data()) {
// had to pick mapping // had to pick mapping
$status = false; $status = false;
import_cleanup($importcode); import_cleanup($importcode);
echo $OUTPUT->notification(get_string('importfailed', 'grades')); // Relying on the default import failed message below.
break 3; break 3;
} }
@ -445,9 +445,11 @@ if ($formdata = $mform2->get_data()) {
/// at this stage if things are all ok, we commit the changes from temp table /// at this stage if things are all ok, we commit the changes from temp table
if ($status) { if ($status) {
grade_import_commit($course->id, $importcode); grade_import_commit($course->id, $importcode);
} else {
echo $OUTPUT->notification(get_string('importfailed', 'grades'));
} }
} else { } else {
// If data hasn't been submitted then display the data mapping form. // If data hasn't been submitted then display the data mapping form.
$mform2->display(); $mform2->display();
echo $OUTPUT->footer(); echo $OUTPUT->footer();
} }

2
lang/en/grades.php
View file

@ -344,7 +344,7 @@ $string['import'] = 'Import';
$string['importcsv'] = 'Import CSV'; $string['importcsv'] = 'Import CSV';
$string['importcustom'] = 'Import as custom outcomes (only this course)'; $string['importcustom'] = 'Import as custom outcomes (only this course)';
$string['importerror'] = 'An error occurred, this script wasn\'t called with the right parameters.'; $string['importerror'] = 'An error occurred, this script wasn\'t called with the right parameters.';
$string['importfailed'] = 'Import failed'; $string['importfailed'] = 'Import failed. No data was imported.';
$string['importfeedback'] = 'Import feedback'; $string['importfeedback'] = 'Import feedback';
$string['importfile'] = 'Import file'; $string['importfile'] = 'Import file';
$string['importfilemissing'] = 'No file was received, go back to the form and make sure to upload a valid file.'; $string['importfilemissing'] = 'No file was received, go back to the form and make sure to upload a valid file.';