From 06b9df11452fa78832fda6c6c188b561008bd8dd Mon Sep 17 00:00:00 2001
From: Damyon Wiese <damyon@moodle.com>
Date: Fri, 19 Apr 2013 09:27:54 +0800
Subject: [PATCH] MDL-37490 Assign: Minor patch cleanup

Bump version number for mod_assign
Remove use of global $OUTPUT (can use get_renderer() in assign)
Fix language strings
Add missing setTypes
---
 mod/assign/db/upgrade.php     | 25 +++++++++++--------------
 mod/assign/lang/en/assign.php |  4 ++--
 mod/assign/mod_form.php       |  8 +++++---
 mod/assign/version.php        |  2 --
 4 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/mod/assign/db/upgrade.php b/mod/assign/db/upgrade.php
index 6ec82a7036a..f7709a160bc 100644
--- a/mod/assign/db/upgrade.php
+++ b/mod/assign/db/upgrade.php
@@ -206,19 +206,6 @@ function xmldb_assign_upgrade($oldversion) {
     }
 
     // Moodle v2.4.0 release upgrade line.
-    // Put any upgrade step following this.
-    if ($oldversion < 2012112902) {
-        // Define field displayduedate to be added to assign.
-        $table = new xmldb_table('assign');
-        $field = new xmldb_field('displayduedate', XMLDB_TYPE_INTEGER, '2', null, null, null, '0', 'duedate');
-        if (!$dbman->field_exists($table, $field)) {
-            $dbman->add_field($table, $field);
-        }
-
-        // Assign savepoint reached.
-        upgrade_mod_savepoint(true, 2012112902, 'assign');
-    }
-
     if ($oldversion < 2013030600) {
         upgrade_set_timeout(60*20);
 
@@ -433,7 +420,17 @@ function xmldb_assign_upgrade($oldversion) {
     }
 
     // Moodle v2.5.0 release upgrade line.
-    // Put any upgrade step following this.
+    if ($oldversion < 2013050100) {
+        // Define field displayduedate to be added to assign.
+        $table = new xmldb_table('assign');
+        $field = new xmldb_field('displayduedate', XMLDB_TYPE_INTEGER, '2', null, null, null, '0', 'duedate');
+        if (!$dbman->field_exists($table, $field)) {
+            $dbman->add_field($table, $field);
+        }
+
+        // Assign savepoint reached.
+        upgrade_mod_savepoint(true, 2013050100, 'assign');
+    }
 
 
     return true;
diff --git a/mod/assign/lang/en/assign.php b/mod/assign/lang/en/assign.php
index b02ea7c0e33..b3261aa6dee 100644
--- a/mod/assign/lang/en/assign.php
+++ b/mod/assign/lang/en/assign.php
@@ -115,8 +115,8 @@ $string['deletepluginareyousure'] = 'Delete assignment plugin {$a}: are you sure
 $string['deletepluginareyousuremessage'] = 'You are about to completely delete the assignment plugin {$a}. This will completely delete everything in the database associated with this assignment plugin. Are you SURE you want to continue?';
 $string['deletingplugin'] = 'Deleting plugin {$a}.';
 $string['description'] = 'Description';
-$string['displayduedate'] = 'Display due date';
-$string['displayduedate_help'] = "If enabled the due date will be displayed on the course page if one has been set and enabled.";
+$string['displayduedate'] = 'Display on course page';
+$string['displayduedate_help'] = 'If enabled the due date will be displayed on the course page if one has been set and enabled.';
 $string['downloadall'] = 'Download all submissions';
 $string['download all submissions'] = 'Download all submissions in a zip file.';
 $string['duedate'] = 'Due date';
diff --git a/mod/assign/mod_form.php b/mod/assign/mod_form.php
index 6dd05dcc67c..1b39c7e0f86 100644
--- a/mod/assign/mod_form.php
+++ b/mod/assign/mod_form.php
@@ -42,7 +42,7 @@ class mod_assign_mod_form extends moodleform_mod {
      * @return void
      */
     public function definition() {
-        global $CFG, $DB, $PAGE, $OUTPUT;
+        global $CFG, $DB, $PAGE;
         $mform = $this->_form;
 
         $mform->addElement('header', 'general', get_string('general', 'form'));
@@ -83,7 +83,7 @@ class mod_assign_mod_form extends moodleform_mod {
         $mform->addHelpButton('allowsubmissionsfromdate', 'allowsubmissionsfromdate', 'assign');
         $mform->setDefault('allowsubmissionsfromdate', time());
 
-        $name = get_string('duedate', 'assign').$OUTPUT->help_icon('duedate', 'assign');
+        $name = get_string('duedate', 'assign').$assignment->get_renderer()->help_icon('duedate', 'assign');
         $duedateelements[] = $mform->createElement('date_time_selector', 'duedate', $name);
         $duedateelements[] = $mform->createElement('checkbox', 'duedateenable', null, get_string('enable'));
         try {
@@ -97,13 +97,15 @@ class mod_assign_mod_form extends moodleform_mod {
         } else {
             $mform->setDefault('duedate', time()+7*24*3600);
             $mform->setDefault('duedateenable', 0);
+            $mform->setType('duedateenable', PARAM_BOOL);
         }
 
-        $dddname = get_string('displayduedate', 'assign').$OUTPUT->help_icon('displayduedate', 'assign');
+        $dddname = get_string('displayduedate', 'assign').$assignment->get_renderer()->help_icon('displayduedate', 'assign');
         $duedateelements[] = $mform->createElement('checkbox', 'displayduedate', null, $dddname);
         $mform->setDefault('displayduedate', 0);
 
         $mform->addGroup($duedateelements, 'duedategrp', $name, null, false);
+        $mform->setType('displayduedate', PARAM_BOOL);
         $mform->disabledIf('duedategrp', 'duedateenable');
 
         $name = get_string('cutoffdate', 'assign');
diff --git a/mod/assign/version.php b/mod/assign/version.php
index 3b979b4404a..00ab2c60d82 100644
--- a/mod/assign/version.php
+++ b/mod/assign/version.php
@@ -28,5 +28,3 @@ $module->component = 'mod_assign'; // Full name of the plugin (used for diagnost
 $module->version  = 2013050100;    // The current module version (Date: YYYYMMDDXX).
 $module->requires = 2013050100;    // Requires this Moodle version.
 $module->cron     = 60;
-
-
-- 
2.43.0