From 2d11be3b335c09913e6c8a7c2de4f41f95c0f83f Mon Sep 17 00:00:00 2001
From: skodak <skodak>
Date: Sat, 21 Apr 2007 13:15:34 +0000
Subject: [PATCH] MDL-9484 cm-idnumber implementation is incorrect

---
 course/modedit.php        |  9 +++++----
 course/moodleform_mod.php | 15 ++-------------
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/course/modedit.php b/course/modedit.php
index a09a3fdb14..1ff7e9b87f 100644
--- 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 945a105705..a73494aa66 100644
--- 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.
      *
-- 
2.39.5