Merge branch 'master' into list-caching-dev

2.4/blocks/aspirelists/classes/privacy/provider.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace block_aspirelists\privacy;
+
+class provider implements
+  // This plugin does not store any personal user data.
+  \core_privacy\local\metadata\null_provider {
+
+  /**
+   * Return string that explains that no data is held by this plugin.
+   *
+   * @return  string
+   */
+  public static function get_reason() : string {
+    return 'privacy:metadata';
+  }
+}

2.4/blocks/aspirelists/lang/en/block_aspirelists.php

@@ -67,3 +67,4 @@
 
 $string['cachedef_aspirelists'] = 'Talis Aspire reading lists';
 $string['expirelisttask'] = 'Expire Talis Aspire list cache';
+$string['privacy:metadata'] = 'The block holds no data and only displays reading list information retrieved from Talis Aspire.';

2.4/blocks/aspirelists/version.php

@@ -4,6 +4,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version = 201803081833;  // YYYYMMDDHHMM (year, month, day, 24-hr time)
+$plugin->version = 201805291000;  // YYYYMMDDHHMM (year, month, day, 24-hr time)
 $plugin->requires = 2012120300; // YYYYMMDDHH (This is the release version for Moodle 2.4)
-$plugin->component = 'block_aspirelists';
+$plugin->component = 'block_aspirelists';

2.x-activity-module/mod/aspirelists/db/upgrade.php

@@ -131,4 +131,8 @@ function xmldb_aspirelists_upgrade($oldversion) {
         upgrade_mod_savepoint(true, 2017070400, 'aspirelists');
     }
 
+    if ($oldversion < 201805291000){
+        upgrade_mod_savepoint(true, 201805291000, 'aspirelists');
+    }
+
 }

2.x-activity-module/mod/aspirelists/lang/en/aspirelists.php

@@ -3,6 +3,9 @@
 // Released under the LGPL Licence - http://www.gnu.org/licenses/lgpl.html. Anyone is free to change or redistribute this code.
 
 $string['modulename'] = 'Course Resource List';
+$string['modulename_help'] = 'The resource list allows lists or sections of lists to be embedded within a Moodle course.  Displaying lists in-line can be useful for including reading material alongside other course resources.  As sections of lists can be displayed it is possible to break down resources and reading material on a per-week or per-topic basis.
+
+You may be asked to choose which resource list relates to this Moodle course.';
 $string['pluginname'] = 'Course Resource List';
 
 $string['eventAspireLaunch'] = 'Talis Aspire Launch Event';

2.x-activity-module/mod/aspirelists/launch.php

@@ -18,6 +18,11 @@
 $course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
 $context = context_module::instance($cm->id);
 
+if($CFG->version >= 2017111300) {
+    $PAGE->set_cm($cm, $course); // set up global $COURSE
+}
+
+// Log the launch
 if($CFG->version < 2014051200) {
     add_to_log($course->id, "aspirelists", "launch", "launch.php?id=$cm->id", "$list->id");
 } else {
@@ -32,6 +37,7 @@
     $event->trigger();
 }
 
+// Perform the launch
 $list->cmid = $cm->id;
 aspirelists_add_lti_properties($list);
 if($CFG->version >= 2015111600) {

README.md

@@ -41,3 +41,15 @@ To determine what version of this block you are using,
 ## 1.x
 
 This directory contains a module which is no longer actively developed and was last tested for the 1.x versions of Moodle.
+
+# Contributing changes and reporting issues
+
+Without your feedback and input, these plugins would not be where they are today. If you have an idea for an improvement, or have made a change in a local copy of the plugin, then please do contribute.
+
+## Guidelines for contributing
+
+1. Raise an issue first — this means that a disucssion can be had about the change
+1. Fork this repo
+1. Make changes in a new branch.
+1. Raise a Pull Request against this repo with those changes, and reference the issue from step 1
+1. Once a review of the changes has been completed, we'll merge the changes into the master branch.