Merge pull request #534 from turnitin/develop

Release 2020072201

Author: CharlotteSpinks

CHANGELOG.md

@@ -1,3 +1,13 @@
+### Date:       2020-July-22
+### Release:	2020072201
+
+#### :wrench: Fixes and enhancements
+
+#### Plagiarism Plugin settings will only appear once
+
+A bug had caused the Plagiarism Plugin settings to display twice when creating an assignment in Moodle versions prior to 3.9. This has been fixed for all supported Moodle versions. 
+
+---
 ### Date:       2020-July-07
 ### Release:	2020070801
 

db/upgrade.php

@@ -417,7 +417,7 @@ function xmldb_plagiarism_turnitin_upgrade($oldversion) {
     }
 
     if ($oldversion < 2020070801) {
-        // Convert plugin _use settings as they are bring deprecated.
+        // Convert plugin _use settings as they are being deprecated.
         $data = get_config('plagiarism');
         $value = (empty($data->turnitin_use)) ? 0 : 1;
         set_config('enabled', $value, 'plagiarism_turnitin');

lib.php

@@ -272,13 +272,14 @@ public function save_form_elements($data) {
      * @param object $context
      * @return type
      */
-    public function get_form_elements_module($mform, $context, $modulename = "", $source = "") {
-        global $CFG, $DB, $PAGE, $COURSE;
+    public function get_form_elements_module($mform, $context, $modulename = "") {
+        global $DB, $PAGE, $COURSE;
 
         // This is a bit of a hack and untidy way to ensure the form elements aren't displayed
         // twice. This won't be needed once this method goes away.
         // TODO: Remove once this method goes away.
-        if ($source != "new_method" && $CFG->branch >= 39) {
+        static $settingsdisplayed;
+        if ($settingsdisplayed) {
             return;
         }
 
@@ -327,6 +328,7 @@ public function get_form_elements_module($mform, $context, $modulename = "", $so
                 $course = $this->get_course_data($cmid, $COURSE->id);
                 $turnitinview->add_elements_to_settings_form($mform, $course, "activity", $modulename, $cmid, $plagiarismvalues["plagiarism_rubric"]);
             }
+            $settingsdisplayed = true;
 
             // Disable all plagiarism elements if turnitin is not enabled.
             foreach ($plagiarismelements as $element) {
@@ -2840,8 +2842,7 @@ function plagiarism_turnitin_coursemodule_standard_elements($formwrapper, $mform
     $pluginturnitin->get_form_elements_module(
         $mform,
         $context,
-        isset($formwrapper->get_current()->modulename) ? 'mod_'.$formwrapper->get_current()->modulename : '',
-        "new_method");
+        isset($formwrapper->get_current()->modulename) ? 'mod_'.$formwrapper->get_current()->modulename : '');
 }
 
 /**

version.php

@@ -19,7 +19,7 @@
  * @copyright 2012 iParadigms LLC
  */
 
-$plugin->version = 2020070801;
+$plugin->version = 2020072201;
 $plugin->release = "3.5+";
 $plugin->requires = 2018051700;
 $plugin->component = 'plagiarism_turnitin';