Merge pull request #52 from WisdmLabs/dev

dev to master for v1.1.1
WisdmLabs · Sep 3, 2021 · 03d7293 · 03d7293
2 parents b445a9a + 45816c8
commit 03d7293
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 10 deletions.
diff --git a/changes.txt b/changes.txt
@@ -1,4 +1,9 @@
 Version 1.1.1
+Fixes:
+Folder activity issue with general section of card and list layout.
+Improved display_file function.
+
+Version 1.1.0
 Feature
 * Added setting to set default course layout
 * Moodle 3.11 compatibility

diff --git a/classes/course_format_data_common_trait.php b/classes/course_format_data_common_trait.php
@@ -177,9 +177,7 @@ public function get_list_activities_details($section, $course, $courserenderer,
                 );
                 $activitydetails->viewurl = $mod->url;
                 $activitydetails->title = $courserenderer->course_section_cm_name($mod, $displayoptions);
-                if (array_search($mod->modname, array('label', 'folder')) !== false) {
-                    $activitydetails->title = $courserenderer->course_section_cm_text($mod, $displayoptions);
-                }
+                    $activitydetails->title .= $courserenderer->course_section_cm_text($mod, $displayoptions);
                 $activitydetails->title .= $mod->afterlink;
                 $activitydetails->modulename = $mod->modname;
                 $activitydetails->summary = $courserenderer->course_section_cm_text($mod, $displayoptions);

diff --git a/classes/output/card_all_sections_summary_renderable.php b/classes/output/card_all_sections_summary_renderable.php
@@ -274,8 +274,8 @@ private function get_activities_details($section, $displayoptions = array()) {
                 );
                 $activitydetails->viewurl = $mod->url;
                 $activitydetails->title = $this->courserenderer->course_section_cm_name($mod, $displayoptions);
-                if (array_search($mod->modname, array('label', 'folder')) !== false) {
-                    $activitydetails->title = $this->courserenderer->course_section_cm_text($mod, $displayoptions);
+                if (array_search($mod->modname, array('folder')) !== false) {
+                    $activitydetails->title .= $this->courserenderer->course_section_cm_text($mod, $displayoptions);
                 }
                 $activitydetails->title .= $mod->afterlink;
                 $activitydetails->modulename = $mod->modname;

diff --git a/gulpfile.js b/gulpfile.js
@@ -53,7 +53,7 @@ gulp.task('watch', function(done) {
 });
 
 gulp.task('clean', function() {
-    return del(['amd/build/*']);
+    return del(['./amd/build/*']);
 });
 
 gulp.task('default', gulp.series('clean', 'compress', 'sass', 'purge', 'watch'));
diff --git a/lib.php b/lib.php
@@ -316,11 +316,11 @@ public function course_format_options($foreditform = false) {
                 'remuicourseimage_filemanager' => array(
                     'label' => new lang_string('remuicourseimage_filemanager', 'format_remuiformat'),
                     'element_type' => 'filemanager',
-                    'element_attributes' => array(
+                    'element_attributes' => [[], array(
                         'subdirs' => 0,
                         'maxfiles' => 1,
                         'accepted_types' => array('web_image')
-                    ),
+                    )],
                     'help' => 'remuicourseimage_filemanager',
                     'help_component' => 'format_remuiformat',
                 ),

diff --git a/version.php b/version.php
@@ -23,8 +23,8 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2021080300;                    // The current plugin version (Date: YYYYMMDDXX).
-$plugin->release   = '1.1.0';
+$plugin->version   = 2021090300;                    // The current plugin version (Date: YYYYMMDDXX).
+$plugin->release   = '1.1.1';
 $plugin->requires  = 2017111300;                    // Requires this Moodle version (Moodle V3.4.0).
 $plugin->maturity  = MATURITY_STABLE;
 $plugin->component = 'format_remuiformat';          // Full name of the plugin (used for diagnostics).