Skip to content

Commit 65a9de1

Browse files
Merge pull request #720 from turnitin/develop
Release 2024032901
2 parents ff44ca9 + 18fe96e commit 65a9de1

14 files changed

+27
-19
lines changed

CHANGELOG.md

+7
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
### Date: 2024-March-29
2+
### Release: v2024032901
3+
4+
#### Export Buttons Fixed
5+
6+
The export buttons along with the individual submission refresh and download buttons and the bulk submission download buttons are now functioning as expected.
7+
18
### Date: 2024-February-06
29
### Release: v2024020601
310

classes/v1migration/v1migration.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -550,7 +550,7 @@ private function log_success_migration_event($turnitintooltwoid, $course_id, $v1
550550
}
551551

552552
/**
553-
* Get assignments for migrated data table. Called from ajax.php via turnitintooltwo_extra-2024020601.min.js.
553+
* Get assignments for migrated data table. Called from ajax.php via turnitintooltwo_extra-2024032901.min.js.
554554
*
555555
* @global type $DB
556556
* @return array return array of assignments to display

jquery/plugins.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
$plugins = array(
2020
'turnitintooltwo-dataTables' => array('files' => array('jquery.dataTables.js', 'jquery.dataTables.css')),
2121
'turnitintooltwo-dataTables_plugins' => array('files' => array('jquery.dataTables.plugins.js')),
22-
'turnitintooltwo-turnitintooltwo' => array('files' => array('turnitintooltwo-2024020601.min.js')),
23-
'turnitintooltwo-turnitintooltwo_extra' => array('files' => array('turnitintooltwo_extra-2024020601.min.js')),
24-
'turnitintooltwo-turnitintooltwo_settings' => array('files' => array('turnitintooltwo_settings-2024020601.min.js')),
22+
'turnitintooltwo-turnitintooltwo' => array('files' => array('turnitintooltwo-2024032901.min.js')),
23+
'turnitintooltwo-turnitintooltwo_extra' => array('files' => array('turnitintooltwo_extra-2024032901.min.js')),
24+
'turnitintooltwo-turnitintooltwo_settings' => array('files' => array('turnitintooltwo_settings-2024032901.min.js')),
2525
'turnitintooltwo-datatables_columnfilter' => array('files' => array('jquery.dataTables.columnFilter.js')),
2626
'turnitintooltwo-cookie' => array('files' => array('jquery.cookie.js')),
2727
'turnitintooltwo-colorbox' => array('files' => array('jquery.colorbox.js', 'colorbox.css')),

jquery/turnitintooltwo-2024020601.min.js.map

-1
This file was deleted.

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

+9-9
Original file line numberDiff line numberDiff line change
@@ -1164,10 +1164,10 @@
11641164
// ZIP containing all files in original format.
11651165
function initialiseZipDownloads(part_id) {
11661166
// Unbind the event first to stop it being binded multiple times.
1167-
$('#tabs-' + part_id + ' .orig_zip_open, #tabs-' + part_id + ' .pdf_zip_open, #tabs-' + part_id + ' .xls_inbox_open').off("click");
1167+
$('#tabs-' + part_id + ' .orig_zip_open, #tabs-' + part_id + ' .pdf_zip_open, #tabs-' + part_id + ' .xls_inbox_open').unbind("click");
11681168

11691169
// Open a spreadsheet or a zip file containing all the relevant data.
1170-
$('#tabs-' + part_id + ' .orig_zip_open, #tabs-' + part_id + ' .pdf_zip_open, #tabs-' + part_id + ' .xls_inbox_open').on(function () {
1170+
$('#tabs-' + part_id + ' .orig_zip_open, #tabs-' + part_id + ' .pdf_zip_open, #tabs-' + part_id + ' .xls_inbox_open').click(function () {
11711171
var idStr = $(this).attr("id").split("_");
11721172
downloadZipFile(idStr[0] + "_" + idStr[1], idStr[2]);
11731173
});
@@ -1239,9 +1239,9 @@
12391239

12401240
function initialiseHiddenZipDownloads(part_id) {
12411241
// Unbind the event first to stop it being binded multiple times.
1242-
$('#tabs-' + part_id + ' .mod_turnitintooltwo_origchecked_zip_open').off("click");
1242+
$('#tabs-' + part_id + ' .mod_turnitintooltwo_origchecked_zip_open').unbind("click");
12431243
// Seperate binder for hidden zip file link.
1244-
$('#tabs-' + part_id + ' .mod_turnitintooltwo_origchecked_zip_open').on(function () {
1244+
$('#tabs-' + part_id + ' .mod_turnitintooltwo_origchecked_zip_open').click(function () {
12451245
var idStr = $(this).attr("id").split("_");
12461246
downloadZipFile(idStr[0] + "_" + idStr[1], part_id);
12471247
return false;
@@ -1255,9 +1255,9 @@
12551255
}
12561256

12571257
// Unbind the event first to stop it being binded multiple times.
1258-
$(identifier).off("click");
1258+
$(identifier).unbind("click");
12591259

1260-
$(identifier).on(function () {
1260+
$(identifier).click(function () {
12611261
$(this).hide();
12621262
$(this).siblings('.fa-spinner').css("display", "inline-block").addClass('fa-lg');
12631263
var idStr = $(this).parent().attr("id").split("_");
@@ -1273,9 +1273,9 @@
12731273
}
12741274

12751275
// Unbind the event first to stop it being binded multiple times.
1276-
$(identifier).off("click");
1276+
$(identifier).unbind("click");
12771277

1278-
$(identifier).on(function () {
1278+
$(identifier).click(function () {
12791279
var idStr = $(this).attr("id").split("_");
12801280
// Don't open OR DV if score is pending.
12811281
if (!$(this).children('.score_colour').hasClass('score_colour_')) {
@@ -1425,7 +1425,7 @@
14251425
$('#tabs-' + part_id + ' .mod_turnitintooltwo_zip_downloads button').removeAttr("title");
14261426
initialiseHiddenZipDownloads(part_id);
14271427
} else {
1428-
$('#tabs-' + part_id + ' .mod_turnitintooltwo_origchecked_zip_open').off('click');
1428+
$('#tabs-' + part_id + ' .mod_turnitintooltwo_origchecked_zip_open').unbind('click');
14291429
$('#tabs-' + part_id + ' .mod_turnitintooltwo_zip_downloads button').prop("disabled", true);
14301430
$('#tabs-' + part_id + ' .mod_turnitintooltwo_zip_downloads button').prop("title", M.str.turnitintooltwo.download_button_warning);
14311431
}

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

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

jquery/turnitintooltwo-2024032901.min.js.map

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -1167,7 +1167,7 @@ function turnitintooltwo_sort_array(&$data, $sortcol, $sortdir) {
11671167
}
11681168

11691169
/**
1170-
* Get files for displaying in settings. Called from ajax.php via turnitintooltwo-2024020601.min.js.
1170+
* Get files for displaying in settings. Called from ajax.php via turnitintooltwo-2024032901.min.js.
11711171
*
11721172
* @param $moduleid the id of the module to return files for
11731173
* @global type $DB
@@ -1290,7 +1290,7 @@ function turnitintooltwo_pluginfile($course,
12901290
}
12911291

12921292
/**
1293-
* Get users for unlinking/relinking. Called from ajax.php via turnitintooltwo-2024020601.min.js.
1293+
* Get users for unlinking/relinking. Called from ajax.php via turnitintooltwo-2024032901.min.js.
12941294
*
12951295
* @global type $DB
12961296
* @return array return array of users to display

tests/unit/classes/view/turnitintooltwo_view_test.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ class mod_turnitintooltwo_view_testcase extends test_lib {
4343
/**
4444
* Test that the page layout is set to standard so that the header displays.
4545
*/
46+
4647
public function test_output_header() {
4748
global $PAGE;
4849
$turnitintooltwoview = new turnitintooltwo_view();
@@ -53,7 +54,7 @@ public function test_output_header() {
5354
$turnitintooltwoview->output_header($pageurl, $pagetitle, $pageheading, true);
5455

5556
$this->assertStringContainsString($pageurl, (string)$PAGE->url);
56-
$this->assertEquals($pagetitle, $PAGE->title);
57+
$this->assertStringContainsString($pagetitle, $PAGE->title);
5758
$this->assertEquals($pageheading, $PAGE->heading);
5859
}
5960

version.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
$plugin = new StdClass();
2626
}
2727

28-
$plugin->version = 2024020601;
28+
$plugin->version = 2024032901;
2929
$plugin->release = "4.1+";
3030
$plugin->requires = 2016052300;
3131
$plugin->component = 'mod_turnitintooltwo';

0 commit comments

Comments
 (0)