MDL-48008 gradeimport_xml: report errors usefully

moodle · Oct 31, 2014 · 9139195 · 9139195
1 parent 7deea8e
commit 9139195
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/grade/import/xml/import.php b/grade/import/xml/import.php
@@ -48,7 +48,8 @@
 
 $text = download_file_content($url);
 if ($text === false) {
-    print_error('cannotreadfile');
+    print_error('cannotreadfile', 'error',
+            $CFG->wwwroot . '/grade/import/xml/index.php?id=' . $id, $url);
 }
 
 $error = '';
@@ -75,7 +76,6 @@
     }
 
 } else {
-    print_error('error', 'gradeimport_xml');
+    print_error('errorduringimport', 'gradeimport_xml',
+            $CFG->wwwroot . '/grade/import/xml/index.php?id=' . $id, $error);
 }
-
-
diff --git a/grade/import/xml/lang/en/gradeimport_xml.php b/grade/import/xml/lang/en/gradeimport_xml.php
@@ -30,6 +30,7 @@
 $string['errincorrectidnumber'] = 'Error - incorrect idnumber';
 $string['errincorrectuseridnumber'] = 'Error - idnumber \'{$a}\' from the import file does not match any user.';
 $string['error'] = 'Errors occur';
+$string['errorduringimport'] = 'An error occurred when trying to import: {$a}';
 $string['fileurl'] = 'Remote file URL';
 $string['pluginname'] = 'XML file';
 $string['xml:publish'] = 'Publish import grades from XML';