MDL-9636 grade_items are now limited to current course only - can not import into...

diff --git a/grade/import/csv/index.php b/grade/import/csv/index.php
index 0616a7c2c2303800b1b63b54e560aacfaa917770..6e241673b6bc74dcfb075960cb9fea17f277038c 100755 (executable)
--- a/grade/import/csv/index.php
+++ b/grade/import/csv/index.php
@@ -1,5 +1,6 @@
 <?php  //$Id$
 require_once '../../../config.php';
+require_once $CFG->libdir.'/gradelib.php';
 require_once $CFG->dirroot.'/grade/lib.php';
 require_once '../grade_import_form.php';
 require_once '../lib.php';
@@ -226,8 +227,7 @@ if (($formdata = data_submitted()) && !empty($formdata->map)) {
 
                             // case of an id, only maps id of a grade_item
                             // this was idnumber
-                            include_once($CFG->libdir.'/grade/grade_item.php');
-                            if (!$gradeitem = new grade_item(array('id'=>$map[$key]))) {
+                            if (!$gradeitem = new grade_item(array('id'=>$map[$key], 'courseid'=>$course->id))) {
                                 // supplied bad mapping, should not be possible since user
                                 // had to pick mapping
                                 $status = false;
@@ -319,7 +319,6 @@ if (($formdata = data_submitted()) && !empty($formdata->map)) {
 
 } else if ($formdata = $mform->get_data()) {
     // else if file is just uploaded
-
     $filename = $mform->get_userfile_name();
 
     // Large files are likely to take their time and memory. Let PHP know
@@ -371,7 +370,6 @@ if (($formdata = data_submitted()) && !empty($formdata->map)) {
     echo '</table>';
 
     /// feeding gradeitems into the grade_import_mapping_form
-    include_once($CFG->libdir.'/grade/grade_item.php');
     $gradeitems = array();
     if ($id) {
         if ($grade_items = grade_item::fetch_all(array('courseid'=>$id))) {

diff --git a/grade/import/xml/index.php b/grade/import/xml/index.php
index 73e081a49acc33a6635b7ead6a367f063c5bbe29..443fb20583ee52dc868f5e45f866ff91ef50a7e5 100755 (executable)
--- a/grade/import/xml/index.php
+++ b/grade/import/xml/index.php
@@ -6,6 +6,7 @@
  */
 
 require_once '../../../config.php';
+require_once $CFG->libdir.'/gradelib.php';
 require_once $CFG->dirroot.'/grade/lib.php';
 require_once '../grade_import_form.php';
 require_once '../lib.php';
@@ -85,8 +86,7 @@ if ( $formdata = $mform->get_data()) {
                 $numlines ++;
             }
 
-            include_once($CFG->libdir.'/grade/grade_item.php');
-            if (!$gradeitem = new grade_item(array('idnumber'=>$result['#']['assignment'][0]['#']))) {
+            if (!$gradeitem = new grade_item(array('idnumber'=>$result['#']['assignment'][0]['#'], 'courseid'=>$course->id))) {
                 // gradeitem does not exist
                 // no data in temp table so far, abort
                 $status = false;