workshop uses plain checkbox instead of advcheckbox

diff --git a/mod/workshop/lib.php b/mod/workshop/lib.php
index d2dff14639a0c3f73184f0aa3c4f2ef02c64ba37..949ecaa1ccd76fa001f812add0697baad6e477c1 100644 (file)
--- a/mod/workshop/lib.php
+++ b/mod/workshop/lib.php
@@ -70,9 +70,13 @@ function workshop_add_instance(stdClass $workshop) {
     global $CFG, $DB;
     require_once(dirname(__FILE__) . '/locallib.php');
 
-    $workshop->phase        = workshop::PHASE_SETUP;
-    $workshop->timecreated  = time();
-    $workshop->timemodified = $workshop->timecreated;
+    $workshop->phase                = workshop::PHASE_SETUP;
+    $workshop->timecreated          = time();
+    $workshop->timemodified         = $workshop->timecreated;
+    $workshop->useexamples          = (int)!empty($workshop->useexamples);          // unticked checkbox hack
+    $workshop->usepeerassessment    = (int)!empty($workshop->usepeerassessment);    // unticked checkbox hack
+    $workshop->useselfassessment    = (int)!empty($workshop->useselfassessment);    // unticked checkbox hack
+    $workshop->latesubmissions      = (int)!empty($workshop->latesubmissions);      // unticked checkbox hack
 
     // insert the new record so we get the id
     $workshop->id = $DB->insert_record('workshop', $workshop);
@@ -116,8 +120,12 @@ function workshop_update_instance(stdClass $workshop) {
     global $CFG, $DB;
     require_once(dirname(__FILE__) . '/locallib.php');
 
-    $workshop->timemodified = time();
-    $workshop->id = $workshop->instance;
+    $workshop->timemodified         = time();
+    $workshop->id                   = $workshop->instance;
+    $workshop->useexamples          = (int)!empty($workshop->useexamples);          // unticked checkbox hack
+    $workshop->usepeerassessment    = (int)!empty($workshop->usepeerassessment);    // unticked checkbox hack
+    $workshop->useselfassessment    = (int)!empty($workshop->useselfassessment);    // unticked checkbox hack
+    $workshop->latesubmissions      = (int)!empty($workshop->latesubmissions);      // unticked checkbox hack
 
     // todo - if the grading strategy is being changed, we must replace all aggregated peer grades with nulls
     // todo - if maximum grades are being changed, we should probably recalculate or invalidate them

diff --git a/mod/workshop/mod_form.php b/mod/workshop/mod_form.php
index dfa163ffb18ee26c0c537aac4dc718a1f4e307bb..8dd9fc601e8944b2448ced2a235d3c5fabb6e6f5 100644 (file)
--- a/mod/workshop/mod_form.php
+++ b/mod/workshop/mod_form.php
@@ -69,17 +69,17 @@ class mod_workshop_mod_form extends moodleform_mod {
 
         $label = get_string('useexamples', 'workshop');
         $text = get_string('useexamplesdesc', 'workshop');
-        $mform->addElement('advcheckbox', 'useexamples', $label, $text);
+        $mform->addElement('checkbox', 'useexamples', $label, $text);
         $mform->setHelpButton('useexamples', array('useexamples', $label, 'workshop'));
 
         $label = get_string('usepeerassessment', 'workshop');
         $text = get_string('usepeerassessmentdesc', 'workshop');
-        $mform->addElement('advcheckbox', 'usepeerassessment', $label, $text);
+        $mform->addElement('checkbox', 'usepeerassessment', $label, $text);
         $mform->setHelpButton('usepeerassessment', array('usepeerassessment', $label, 'workshop'));
 
         $label = get_string('useselfassessment', 'workshop');
         $text = get_string('useselfassessmentdesc', 'workshop');
-        $mform->addElement('advcheckbox', 'useselfassessment', $label, $text);
+        $mform->addElement('checkbox', 'useselfassessment', $label, $text);
         $mform->setHelpButton('useselfassessment', array('useselfassessment', $label, 'workshop'));
 
         // Grading settings -----------------------------------------------------------
@@ -136,7 +136,7 @@ class mod_workshop_mod_form extends moodleform_mod {
 
         $label = get_string('latesubmissions', 'workshop');
         $text = get_string('latesubmissionsdesc', 'workshop');
-        $mform->addElement('advcheckbox', 'latesubmissions', $label, $text);
+        $mform->addElement('checkbox', 'latesubmissions', $label, $text);
         $mform->setHelpButton('latesubmissions', array('latesubmissions', $label, 'workshop'));
         $mform->setAdvanced('latesubmissions');