MDL-9484 cm-idnumber implementation is incorrect

diff --git a/course/modedit.php b/course/modedit.php
index a09a3fdb1435156cd4dc654c4467f737ed8727ae..1ff7e9b87fbe2d1badee7a1c973ed239505e5686 100644 (file)
--- a/course/modedit.php
+++ b/course/modedit.php
@@ -92,6 +92,7 @@
 
         $form->coursemodule = $cm->id;
         $form->section      = $cm->section;     // The section ID
+        $form->cmidnumber   = $cm->idnumber;    // The cm IDnumber
         $form->course       = $course->id;
         $form->module       = $module->id;
         $form->modulename   = $module->name;
@@ -207,8 +208,8 @@
             }
             
             // set cm id number
-            if (isset($fromform->idnumber)) {
-                set_coursemodule_idnumber($fromform->coursemodule, $fromform->idnumber);  
+            if (isset($fromform->cmidnumber)) {
+                set_coursemodule_idnumber($fromform->coursemodule, $fromform->cmidnumber);  
             }
 
             add_to_log($course->id, "course", "update mod",
@@ -268,8 +269,8 @@
             set_coursemodule_visible($fromform->coursemodule, $fromform->visible);
             
             // set cm idnumber
-            if (isset($fromform->idnumber)) {
-                set_coursemodule_idnumber($fromform->coursemodule, $fromform->idnumber);  
+            if (isset($fromform->cmidnumber)) {
+                set_coursemodule_idnumber($fromform->coursemodule, $fromform->cmidnumber);  
             }
             
             add_to_log($course->id, "course", "add mod",

diff --git a/course/moodleform_mod.php b/course/moodleform_mod.php
index 945a105705b10efd8cd4cc3ffae29f8665c875cb..a73494aa66a8b8cd2d386408989ebe82c292a200 100644 (file)
--- a/course/moodleform_mod.php
+++ b/course/moodleform_mod.php
@@ -68,8 +68,7 @@ class moodleform_mod extends moodleform {
             $mform->addElement('modgroupmode', 'groupmode', get_string('groupmode'));
         }
         $mform->addElement('modvisible', 'visible', get_string('visible'));
-        $mform->addElement('text', 'idnumber', get_string('idnumber'));
-        $mform->setDefault('idnumber', $this->_cm->idnumber);
+        $mform->addElement('text', 'cmidnumber', get_string('idnumber'));
         $this->standard_hidden_coursemodule_elements();
     }
 
@@ -113,7 +112,7 @@ class moodleform_mod extends moodleform {
      * @return unknown
      */
     function standard_coursemodule_elements_settings(){
-        return ($this->modgroupmode_settings() + $this->modvisible_settings() + $this->modidnumber_settings());
+        return ($this->modgroupmode_settings() + $this->modvisible_settings());
     }
     /**
      * This is called from modedit.php to load the default for the groupmode element.
@@ -125,16 +124,6 @@ class moodleform_mod extends moodleform {
         global $COURSE;
         return array('groupmode'=>groupmode($COURSE, $this->_cm));
     }
-    /**
-     * This is called from modedit.php to load the default for the groupmode element.
-     *
-     * @param object $course
-     * @param object $cm
-     */
-    function modidnumber_settings() {
-        global $COURSE;
-        return array('idnumber'=>$this->_cm->idnumber);
-    }
     /**
      *  This is called from modedit.php to set the default for modvisible form element.
      *