Merge pull request #711 from ixiongtii/fix/anonymous_field_required

Fix reveal anonymous button

Author: ixiongtii

ajax.php

@@ -569,15 +569,12 @@
             $turnitintooltwosubmission = new turnitintooltwo_submission($submissionid, "turnitin");
             if ($turnitintooltwosubmission->unanonymise_submission($reason)) {
                 if ($turnitintooltwosubmission->userid == 0) {
-
                     $tmpuser = new stdClass();
-                    $tmpuser->firstname = $turnitintooltwosubmission->nmfirstname;
-                    $tmpuser->lastname = $turnitintooltwosubmission->nmlastname;
-
+                    $tmpuser->firstname = $turnitintooltwosubmission->firstname;
+                    $tmpuser->lastname = $turnitintooltwosubmission->lastname;
                     $return["name"] = fullname($tmpuser);
                 } else {
-                    $user = new turnitintooltwo_user($turnitintooltwosubmission->userid);
-                    $return["name"] = fullname($user);
+                    $return["name"] = $turnitintooltwosubmission->fullname;
                 }
                 $return["status"] = "success";
                 $return["userid"] = $turnitintooltwosubmission->userid;

jquery/turnitintooltwo-2023032701.js

@@ -1094,8 +1094,14 @@
                     }
                     $("#submission_id").html(submission_id);
                     $('#cboxLoadedContent .mod_turnitintooltwo_unanonymise_form').show();
-                    $('#id_reveal').unbind("click");
-                    $('#id_reveal').click(function () {
+                    $('#id_reveal').prop('disabled', true);
+
+                    $('#id_anonymous_reveal_reason').on('input', function() {
+                        var reason_text = $(this).val();
+                        $('#id_reveal').prop('disabled', reason_text === ''); // Enable/disable button based on textarea content
+                    });
+
+                    $('#id_reveal').on('click', function() {
                         $.ajax({
                             "dataType": 'json',
                             "type": "POST",
@@ -1158,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').unbind("click");
+            $('#tabs-' + part_id + ' .orig_zip_open, #tabs-' + part_id + ' .pdf_zip_open, #tabs-' + part_id + ' .xls_inbox_open').off("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').click(function () {
+            $('#tabs-' + part_id + ' .orig_zip_open, #tabs-' + part_id + ' .pdf_zip_open, #tabs-' + part_id + ' .xls_inbox_open').on(function () {
                 var idStr = $(this).attr("id").split("_");
                 downloadZipFile(idStr[0] + "_" + idStr[1], idStr[2]);
             });
@@ -1233,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').unbind("click");
+            $('#tabs-' + part_id + ' .mod_turnitintooltwo_origchecked_zip_open').off("click");
             // Seperate binder for hidden zip file link.
-            $('#tabs-' + part_id + ' .mod_turnitintooltwo_origchecked_zip_open').click(function () {
+            $('#tabs-' + part_id + ' .mod_turnitintooltwo_origchecked_zip_open').on(function () {
                 var idStr = $(this).attr("id").split("_");
                 downloadZipFile(idStr[0] + "_" + idStr[1], part_id);
                 return false;
@@ -1249,9 +1255,9 @@
             }
 
             // Unbind the event first to stop it being binded multiple times.
-            $(identifier).unbind("click");
+            $(identifier).off("click");
 
-            $(identifier).click(function () {
+            $(identifier).on(function () {
                 $(this).hide();
                 $(this).siblings('.fa-spinner').css("display", "inline-block").addClass('fa-lg');
                 var idStr = $(this).parent().attr("id").split("_");
@@ -1267,9 +1273,9 @@
             }
 
             // Unbind the event first to stop it being binded multiple times.
-            $(identifier).unbind("click");
+            $(identifier).off("click");
 
-            $(identifier).click(function () {
+            $(identifier).on(function () {
                 var idStr = $(this).attr("id").split("_");
                 // Don't open OR DV if score is pending.
                 if (!$(this).children('.score_colour').hasClass('score_colour_')) {
@@ -1419,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').unbind('click');
+                    $('#tabs-' + part_id + ' .mod_turnitintooltwo_origchecked_zip_open').off('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);
                 }