Merge pull request #720 from turnitin/develop

Release 2024032901

CHANGELOG.md

@@ -1,3 +1,10 @@
+### Date:       2024-March-29
+### Release:    v2024032901
+
+#### Export Buttons Fixed
+
+The export buttons along with the individual submission refresh and download buttons and the bulk submission download buttons are now functioning as expected.
+
 ### Date:       2024-February-06
 ### Release:    v2024020601
 

classes/v1migration/v1migration.php

@@ -550,7 +550,7 @@ private function log_success_migration_event($turnitintooltwoid, $course_id, $v1
     }
 
     /**
-     * Get assignments for migrated data table. Called from ajax.php via turnitintooltwo_extra-2024020601.min.js.
+     * Get assignments for migrated data table. Called from ajax.php via turnitintooltwo_extra-2024032901.min.js.
      *
      * @global type $DB
      * @return array return array of assignments to display

jquery/plugins.php

@@ -19,9 +19,9 @@
 $plugins = array(
     'turnitintooltwo-dataTables' => array('files' => array('jquery.dataTables.js', 'jquery.dataTables.css')),
     'turnitintooltwo-dataTables_plugins' => array('files' => array('jquery.dataTables.plugins.js')),
-    'turnitintooltwo-turnitintooltwo' => array('files' => array('turnitintooltwo-2024020601.min.js')),
-    'turnitintooltwo-turnitintooltwo_extra' => array('files' => array('turnitintooltwo_extra-2024020601.min.js')),
-    'turnitintooltwo-turnitintooltwo_settings' => array('files' => array('turnitintooltwo_settings-2024020601.min.js')),
+    'turnitintooltwo-turnitintooltwo' => array('files' => array('turnitintooltwo-2024032901.min.js')),
+    'turnitintooltwo-turnitintooltwo_extra' => array('files' => array('turnitintooltwo_extra-2024032901.min.js')),
+    'turnitintooltwo-turnitintooltwo_settings' => array('files' => array('turnitintooltwo_settings-2024032901.min.js')),
     'turnitintooltwo-datatables_columnfilter' => array('files' => array('jquery.dataTables.columnFilter.js')),
     'turnitintooltwo-cookie' => array('files' => array('jquery.cookie.js')),
     'turnitintooltwo-colorbox' => array('files' => array('jquery.colorbox.js', 'colorbox.css')),

jquery/turnitintooltwo-2024020601.js → jquery/turnitintooltwo-2024032901.js

@@ -1164,10 +1164,10 @@
         // ZIP containing all files in original format.
         function initialiseZipDownloads(part_id) {
             // Unbind the event first to stop it being binded multiple times.
-            $('#tabs-' + part_id + ' .orig_zip_open, #tabs-' + part_id + ' .pdf_zip_open, #tabs-' + part_id + ' .xls_inbox_open').off("click");
+            $('#tabs-' + part_id + ' .orig_zip_open, #tabs-' + part_id + ' .pdf_zip_open, #tabs-' + part_id + ' .xls_inbox_open').unbind("click");
 
             // Open a spreadsheet or a zip file containing all the relevant data.
-            $('#tabs-' + part_id + ' .orig_zip_open, #tabs-' + part_id + ' .pdf_zip_open, #tabs-' + part_id + ' .xls_inbox_open').on(function () {
+            $('#tabs-' + part_id + ' .orig_zip_open, #tabs-' + part_id + ' .pdf_zip_open, #tabs-' + part_id + ' .xls_inbox_open').click(function () {
                 var idStr = $(this).attr("id").split("_");
                 downloadZipFile(idStr[0] + "_" + idStr[1], idStr[2]);
             });
@@ -1239,9 +1239,9 @@
 
         function initialiseHiddenZipDownloads(part_id) {
             // Unbind the event first to stop it being binded multiple times.
-            $('#tabs-' + part_id + ' .mod_turnitintooltwo_origchecked_zip_open').off("click");
+            $('#tabs-' + part_id + ' .mod_turnitintooltwo_origchecked_zip_open').unbind("click");
             // Seperate binder for hidden zip file link.
-            $('#tabs-' + part_id + ' .mod_turnitintooltwo_origchecked_zip_open').on(function () {
+            $('#tabs-' + part_id + ' .mod_turnitintooltwo_origchecked_zip_open').click(function () {
                 var idStr = $(this).attr("id").split("_");
                 downloadZipFile(idStr[0] + "_" + idStr[1], part_id);
                 return false;
@@ -1255,9 +1255,9 @@
             }
 
             // Unbind the event first to stop it being binded multiple times.
-            $(identifier).off("click");
+            $(identifier).unbind("click");
 
-            $(identifier).on(function () {
+            $(identifier).click(function () {
                 $(this).hide();
                 $(this).siblings('.fa-spinner').css("display", "inline-block").addClass('fa-lg');
                 var idStr = $(this).parent().attr("id").split("_");
@@ -1273,9 +1273,9 @@
             }
 
             // Unbind the event first to stop it being binded multiple times.
-            $(identifier).off("click");
+            $(identifier).unbind("click");
 
-            $(identifier).on(function () {
+            $(identifier).click(function () {
                 var idStr = $(this).attr("id").split("_");
                 // Don't open OR DV if score is pending.
                 if (!$(this).children('.score_colour').hasClass('score_colour_')) {
@@ -1425,7 +1425,7 @@
                     $('#tabs-' + part_id + ' .mod_turnitintooltwo_zip_downloads button').removeAttr("title");
                     initialiseHiddenZipDownloads(part_id);
                 } else {
-                    $('#tabs-' + part_id + ' .mod_turnitintooltwo_origchecked_zip_open').off('click');
+                    $('#tabs-' + part_id + ' .mod_turnitintooltwo_origchecked_zip_open').unbind('click');
                     $('#tabs-' + part_id + ' .mod_turnitintooltwo_zip_downloads button').prop("disabled", true);
                     $('#tabs-' + part_id + ' .mod_turnitintooltwo_zip_downloads button').prop("title", M.str.turnitintooltwo.download_button_warning);
                 }

lib.php

@@ -1167,7 +1167,7 @@ function turnitintooltwo_sort_array(&$data, $sortcol, $sortdir) {
 }
 
 /**
- * Get files for displaying in settings. Called from ajax.php via turnitintooltwo-2024020601.min.js.
+ * Get files for displaying in settings. Called from ajax.php via turnitintooltwo-2024032901.min.js.
  *
  * @param  $moduleid the id of the module to return files for
  * @global type $DB
@@ -1290,7 +1290,7 @@ function turnitintooltwo_pluginfile($course,
 }
 
 /**
- * Get users for unlinking/relinking. Called from ajax.php via turnitintooltwo-2024020601.min.js.
+ * Get users for unlinking/relinking. Called from ajax.php via turnitintooltwo-2024032901.min.js.
  *
  * @global type $DB
  * @return array return array of users to display

tests/unit/classes/view/turnitintooltwo_view_test.php

@@ -43,6 +43,7 @@ class mod_turnitintooltwo_view_testcase extends test_lib {
     /**
      * Test that the page layout is set to standard so that the header displays.
      */
+
     public function test_output_header() {
         global $PAGE;
         $turnitintooltwoview = new turnitintooltwo_view();
@@ -53,7 +54,7 @@ public function test_output_header() {
         $turnitintooltwoview->output_header($pageurl, $pagetitle, $pageheading, true);
 
         $this->assertStringContainsString($pageurl, (string)$PAGE->url);
-        $this->assertEquals($pagetitle, $PAGE->title);
+        $this->assertStringContainsString($pagetitle, $PAGE->title);
         $this->assertEquals($pageheading, $PAGE->heading);
     }
 

version.php

@@ -25,7 +25,7 @@
     $plugin = new StdClass();
 }
 
-$plugin->version   = 2024020601;
+$plugin->version   = 2024032901;
 $plugin->release   = "4.1+";
 $plugin->requires  = 2016052300;
 $plugin->component = 'mod_turnitintooltwo';