Merge pull request #489 from turnitin/develop

Release v2018102601
turnitin · Oct 26, 2018 · 4235cf3 · 4235cf3
2 parents 5fb681f + 45e7d9a
commit 4235cf3
Show file tree

Hide file tree

Showing 19 changed files with 36 additions and 23 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,17 @@
-### Date:	2018-October-19
+### Date:		2018-October-26
+### Release:	v2018102601
+
+#### Fixes and enhancements
+
+---
+
+#### The course restoration tool has now been restored for use!
+
+Were you previously using Turnitin.com or TurnitinUK.com before making the switch over to Moodle? The course restoration tool allows you to take your old classes and assignments with you by recreating them within Moodle. Previously, a bug had prevented this functionality from working as intended. Want to learn more? [Check out our guide](https://help.turnitin.com/Feedback_Studio/Moodle/Direct%20V2/Administrator/Administrator%20Category.htm#Turnitinclassrestoration).
+
+---
+
+### Date:		2018-October-19
 ### Release:	v2018101901
 
 #### Fixes and enhancements
@@ -19,7 +32,7 @@ We've received some invaluable bug fixes, in the form of pull requests, to help
 
 ---
 
-### Date:	2018-August-28
+### Date:		2018-August-28
 ### Release:	v2018082801
 
 ### :wrench: Fixes and enhancements

diff --git a/ajax.php b/ajax.php
@@ -212,7 +212,7 @@
         }
         break;
 
-    case "get_assignments":
+    case "get_migration_assignments":
         include_once("classes/v1migration/v1migration.php");
 
         $PAGE->set_context(context_system::instance());

diff --git a/classes/v1migration/v1migration.php b/classes/v1migration/v1migration.php
@@ -568,7 +568,7 @@ private function log_success_migration_event($turnitintooltwoid, $course_id, $v1
     }
 
     /**
-     * Get assignments for migrated data table. Called from ajax.php via turnitintooltwo_extra-2018082301.min.js.
+     * Get assignments for migrated data table. Called from ajax.php via turnitintooltwo_extra-2018102601.min.js.
      *
      * @global type $DB
      * @return array return array of assignments to display

diff --git a/jquery/plugins.php b/jquery/plugins.php
@@ -19,14 +19,14 @@
 $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-2018082301.min.js')),
-    'turnitintooltwo-turnitintooltwo_extra' => array('files' => array('turnitintooltwo_extra-2018082301.min.js')),
-    'turnitintooltwo-turnitintooltwo_settings' => array('files' => array('turnitintooltwo_settings-2018082301.min.js')),
+    'turnitintooltwo-turnitintooltwo' => array('files' => array('turnitintooltwo-2018102601.min.js')),
+    'turnitintooltwo-turnitintooltwo_extra' => array('files' => array('turnitintooltwo_extra-2018102601.min.js')),
+    'turnitintooltwo-turnitintooltwo_settings' => array('files' => array('turnitintooltwo_settings-2018102601.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')),
     'turnitintooltwo-uieditable' => array('files' => array('jqueryui-editable.js', 'jqueryui-editable.css')),
     'turnitintooltwo-moment' => array('files' => array('moment.js')),
     'turnitintooltwo-tooltipster' => array('files' => array('tooltipster.js', 'tooltipster.css')),
-    'turnitintooltwo-migration_tool' => array('files' => array('turnitintooltwo_migration_tool-2018082301.js'))
+    'turnitintooltwo-migration_tool' => array('files' => array('turnitintooltwo_migration_tool-2018102601.js'))
 );
diff --git a/jquery/turnitintooltwo-2018082301.min.js b/jquery/turnitintooltwo-2018082301.min.js
diff --git a/jquery/turnitintooltwo-2018082301.js → jquery/turnitintooltwo-2018102601.js b/jquery/turnitintooltwo-2018082301.js → jquery/turnitintooltwo-2018102601.js
diff --git a/jquery/turnitintooltwo-2018102601.min.js b/jquery/turnitintooltwo-2018102601.min.js
diff --git a/jquery/turnitintooltwo_extra-2018082301.min.js b/jquery/turnitintooltwo_extra-2018082301.min.js
diff --git a/jquery/turnitintooltwo_extra-2018082301.js → jquery/turnitintooltwo_extra-2018102601.js b/jquery/turnitintooltwo_extra-2018082301.js → jquery/turnitintooltwo_extra-2018102601.js
@@ -96,7 +96,7 @@ jQuery(document).ready(function($) {
         "oLanguage": dataTablesLangMigration,
         "aaSorting": [[ 2, "asc" ]],
         "aLengthMenu": [[10, 25, 50, 100, -1], [10, 25, 50, 100, "All"]],
-        "sAjaxSource": "ajax.php?action=get_assignments",
+        "sAjaxSource": "ajax.php?action=get_migration_assignments",
         "sDom": '<"top"lf>rt<"bottom"irp><"clear">',
         "aoColumns": [
                         {"bSortable": false, "bSearchable": false,

diff --git a/jquery/turnitintooltwo_extra-2018102601.min.js b/jquery/turnitintooltwo_extra-2018102601.min.js
diff --git a/jquery/turnitintooltwo_migration_tool-2018082301.min.js b/jquery/turnitintooltwo_migration_tool-2018082301.min.js
diff --git a/...nitintooltwo_migration_tool-2018082301.js → ...nitintooltwo_migration_tool-2018102601.js b/...nitintooltwo_migration_tool-2018082301.js → ...nitintooltwo_migration_tool-2018102601.js