Merge pull request #113 from turnitin/develop

Release v2021030901
turnitin · Mar 9, 2021 · d95c5e0 · d95c5e0
2 parents 1bd1cc5 + 89bea00
commit d95c5e0
Show file tree

Hide file tree

Showing 21 changed files with 42 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,16 @@
+### Date:       2021-March-09
+### Release:    v2021030901
+
+#### :wrench: Fixes and enhancements
+
+---
+
+#### Intro files no longer prevent submissions
+
+As of our last release, a bug caused when attaching an intro file to a submission prevented students from submitting. We have fixed this bug as a matter of urgency, and the intended functionality has been restored.
+
+---
+
 ### Date:       2021-March-02
 ### Release:    v2021030201
 

diff --git a/amd/build/eula_response.min.js b/amd/build/eula_response.min.js
diff --git a/amd/build/eula_response.min.js.map b/amd/build/eula_response.min.js.map
diff --git a/amd/src/eula_response.js b/amd/src/eula_response.js
@@ -30,7 +30,9 @@ define(['jquery', 'core/str'], function($, str) {
     return {
         eulaResponse: function() {
             $(document).ready(function() {
-                $('input[name=submitbutton]').prop('disabled', 'disabled');
+                if ($("#turnitinsim_eulacontainer").length) {
+                    $('input[name=submitbutton]').prop('disabled', 'disabled');
+                }
             });
 
             $(document).on('click', '#pp-eula-accept', function() {

diff --git a/db/upgrade.php b/db/upgrade.php
@@ -294,7 +294,7 @@ function xmldb_plagiarism_turnitinsim_upgrade($oldversion) {
         (new handle_deprecation)->unset_turnitinsim_use();
 
         $table = new xmldb_table('plagiarism_turnitinsim_sub');
-        $field = new xmldb_field('quizanswer', XMLDB_TYPE_CHAR, '32', null, false, null, null, 'tiiretrytime');
+        $field = new xmldb_field('quizanswer', XMLDB_TYPE_CHAR, '32', null, false, null, 0, 'tiiretrytime');
 
         if (!$dbman->field_exists($table, $field)) {
             $dbman->add_field($table, $field);

diff --git a/lang/da/plagiarism_turnitinsim.php b/lang/da/plagiarism_turnitinsim.php
@@ -25,4 +25,4 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$string['help_link'] = 'https://help.turnitin.com/da/integrity/administrator/moodle.htm#step-four';
+$string['help_link'] = 'https://help.turnitin.com/da/integrity/instruktor/moodle.htm';
diff --git a/lang/de/plagiarism_turnitinsim.php b/lang/de/plagiarism_turnitinsim.php
@@ -25,4 +25,4 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$string['help_link'] = 'https://help.turnitin.com/de/integrity/administratoren/verwenden-von-turnitin-mit-moodle.htm#step-four';
+$string['help_link'] = 'https://help.turnitin.com/de/integrity/lehrkrafte/moodle.htm';
diff --git a/lang/en/plagiarism_turnitinsim.php b/lang/en/plagiarism_turnitinsim.php
@@ -198,4 +198,4 @@
 $string['errorgettingsubmissioninfo'] = 'There was an error attempting to get the submission info.';
 $string['errorprocessingdeletedsubmission'] = 'This submission belongs to a deleted assignment and cannot be processed.';
 $string['errorquizattemptnotfound'] = 'The quiz attempt for this submission could not be found.';
-$string['help_link'] = 'https://help.turnitin.com/integrity/administrator/moodle.htm#step-four';
+$string['help_link'] = 'https://help.turnitin.com/integrity/instructor/moodle.htm';
diff --git a/lang/es_mx/plagiarism_turnitinsim.php b/lang/es_mx/plagiarism_turnitinsim.php
@@ -25,4 +25,4 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$string['help_link'] = 'https://help.turnitin.com/es/integrity/administrador/moodle.htm#step-four';
+$string['help_link'] = 'https://help.turnitin.com/es/integrity/instructor/moodle.htm';
diff --git a/lang/fr/plagiarism_turnitinsim.php b/lang/fr/plagiarism_turnitinsim.php
@@ -25,4 +25,4 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$string['help_link'] = 'https://help.turnitin.com/fr/integrity/administrateur/moodle.htm#step-four';
+$string['help_link'] = 'https://help.turnitin.com/fr/integrity/enseignants/moodle.htm';
diff --git a/lang/ja/plagiarism_turnitinsim.php b/lang/ja/plagiarism_turnitinsim.php
@@ -25,4 +25,4 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$string['help_link'] = 'https://help.turnitin.com/jp/integrity/管理者/moodle.htm#step-four';
+$string['help_link'] = 'https://help.turnitin.com/jp/integrity/講師用/moodle.htm';
diff --git a/lang/ko/plagiarism_turnitinsim.php b/lang/ko/plagiarism_turnitinsim.php
@@ -25,4 +25,4 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$string['help_link'] = 'https://help.turnitin.com/ko/integrity/관리자/moodle.htm#step-four';
+$string['help_link'] = 'https://help.turnitin.com/ko/integrity/강사/moodle.htm';
diff --git a/lang/nl/plagiarism_turnitinsim.php b/lang/nl/plagiarism_turnitinsim.php
@@ -25,4 +25,4 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$string['help_link'] = 'https://help.turnitin.com/nl/integrity/beheerder/moodle.htm#step-four';
+$string['help_link'] = 'https://help.turnitin.com/nl/integrity/docenten/moodle.htm';
diff --git a/lang/no/plagiarism_turnitinsim.php b/lang/no/plagiarism_turnitinsim.php
@@ -25,4 +25,4 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$string['help_link'] = 'https://help.turnitin.com/nb/integrity/administrer/moodle.htm#step-four';
+$string['help_link'] = 'https://help.turnitin.com/nb/integrity/instruktor/moodle.htm';
diff --git a/lang/pt_br/plagiarism_turnitinsim.php b/lang/pt_br/plagiarism_turnitinsim.php
@@ -25,4 +25,4 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$string['help_link'] = 'https://help.turnitin.com/pt-br/integrity/administrador/moodle.htm#step-four';
+$string['help_link'] = 'https://help.turnitin.com/pt-br/integrity/professor/moodle.htm';
diff --git a/lang/sv/plagiarism_turnitinsim.php b/lang/sv/plagiarism_turnitinsim.php
@@ -25,4 +25,4 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$string['help_link'] = 'https://help.turnitin.com/sv/integrity/administrator/moodle.htm#step-four';
+$string['help_link'] = 'https://help.turnitin.com/sv/integrity/instruktorer/moodle.htm';
diff --git a/lang/zh_cn/plagiarism_turnitinsim.php b/lang/zh_cn/plagiarism_turnitinsim.php
@@ -25,4 +25,4 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$string['help_link'] = 'https://help.turnitin.com/zh-hans/integrity/管理员身/moodle.htm#step-four';
+$string['help_link'] = 'https://help.turnitin.com/zh-hans/integrity/教师/moodle.htm';
diff --git a/lang/zh_tw/plagiarism_turnitinsim.php b/lang/zh_tw/plagiarism_turnitinsim.php
@@ -25,4 +25,4 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$string['help_link'] = 'https://help.turnitin.com/zh-tw/integrity/管理員/moodle.htm#step-four';
+$string['help_link'] = 'https://help.turnitin.com/zh-tw/integrity/教師/moodle.htm';
diff --git a/lib.php b/lib.php
@@ -498,15 +498,15 @@ public function print_disclosure($cmid, $submissiontype = 'file') {
                 return html_writer::tag(
                     'div',
                     get_string('eulaalreadyaccepted', 'plagiarism_turnitinsim'),
-                    array('class' => 'turnitinsim_eulacontainer', 'id' => 'turnitinsim_eulacontainer')
+                    array('class' => 'turnitinsim_eulacontainer', 'id' => 'turnitinsim_eulaaccepted')
                 );
             }
 
             if (!(bool)$features->tenant->require_eula) {
                 return html_writer::tag(
                     'div',
                     get_string('eulanotrequired', 'plagiarism_turnitinsim'),
-                    array('class' => 'turnitinsim_eulacontainer', 'id' => 'turnitinsim_eulacontainer')
+                    array('class' => 'turnitinsim_eulacontainer', 'id' => 'turnitinsim_eulanotrequired')
                 );
             }
 

diff --git a/styles.css b/styles.css
@@ -34,14 +34,19 @@
 }
 
 /* EULA */
-.turnitinsim_eulacontainer {
+.turnitinsim_eulacontainer,
+#turnitinsim_eulaaccepted,
+#turnitinsim_eulanotrequired {
     border: 1px solid #db4221;
     padding: 10px;
     text-align: center;
     margin-bottom: 10px;
 }
 
-.turnitinsim_eulacontainer #pp-eula-accept {
+.turnitinsim_eulacontainer,
+#turnitinsim_eulaaccepted,
+#turnitinsim_eulanotrequired,
+#pp-eula-accept {
     margin-right: 5px;
 }
 

diff --git a/version.php b/version.php
@@ -25,7 +25,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version = 2021030201;
+$plugin->version = 2021030901;
 $plugin->release = "v1.2";
 $plugin->requires = 2017051500;
 $plugin->component = 'plagiarism_turnitinsim';