From bb6471aa885c935070ba448e9708538e72353502 Mon Sep 17 00:00:00 2001
From: Damyon Wiese <damyon@moodle.com>
Date: Tue, 11 Jun 2013 14:26:33 +0800
Subject: [PATCH] MDL-38359 assign: Add support for admin defaults for marking
 workflow settings

---
 mod/assign/mod_form.php | 10 +++++-----
 mod/assign/settings.php | 19 +++++++++++++++++++
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/mod/assign/mod_form.php b/mod/assign/mod_form.php
index 79c32393fa4..626b60a4b54 100644
--- a/mod/assign/mod_form.php
+++ b/mod/assign/mod_form.php
@@ -179,14 +179,14 @@ class mod_assign_mod_form extends moodleform_mod {
             $mform->freeze('blindmarking');
         }
 
-        $mform->addElement('advcheckbox', 'markingworkflow', get_string('markingworkflow', 'assign'), '', null, array(0, 1));
+        $name = get_string('markingworkflow', 'assign');
+        $mform->addElement('selectyesno', 'markingworkflow', $name);
         $mform->addHelpButton('markingworkflow', 'markingworkflow', 'assign');
-        $mform->setDefault('markingworkflow', 0);
 
-        $mform->addElement('advcheckbox', 'markingallocation', get_string('markingallocation', 'assign'), '', null, array(0, 1));
+        $name = get_string('markingallocation', 'assign');
+        $mform->addElement('selectyesno', 'markingallocation', $name);
         $mform->addHelpButton('markingallocation', 'markingallocation', 'assign');
-        $mform->setDefault('markingallocation', 0);
-        $mform->disabledIf('markingallocation', 'markingworkflow', 'notchecked');
+        $mform->disabledIf('markingallocation', 'markingworkflow', 'eq', 0);
 
         $this->standard_coursemodule_elements();
         $this->apply_admin_defaults();
diff --git a/mod/assign/settings.php b/mod/assign/settings.php
index c535780d76e..6cdc9f17429 100644
--- a/mod/assign/settings.php
+++ b/mod/assign/settings.php
@@ -224,4 +224,23 @@ if ($ADMIN->fulltree) {
     $setting->set_locked_flag_options(admin_setting_flag::ENABLED, false);
     $settings->add($setting);
 
+    $name = new lang_string('markingworkflow', 'mod_assign');
+    $description = new lang_string('markingworkflow_help', 'mod_assign');
+    $setting = new admin_setting_configcheckbox('assign/markingworkflow',
+                                                    $name,
+                                                    $description,
+                                                    0);
+    $setting->set_advanced_flag_options(admin_setting_flag::ENABLED, false);
+    $setting->set_locked_flag_options(admin_setting_flag::ENABLED, false);
+    $settings->add($setting);
+
+    $name = new lang_string('markingallocation', 'mod_assign');
+    $description = new lang_string('markingallocation_help', 'mod_assign');
+    $setting = new admin_setting_configcheckbox('assign/markingallocation',
+                                                    $name,
+                                                    $description,
+                                                    0);
+    $setting->set_advanced_flag_options(admin_setting_flag::ENABLED, false);
+    $setting->set_locked_flag_options(admin_setting_flag::ENABLED, false);
+    $settings->add($setting);
 }