Merge branch 'master' into moodle_500_use_set_sectionid_not_num_mdl-83857

Author: james-cnz

.github/workflows/moodle-ci.yml

@@ -100,9 +100,9 @@ jobs:
         if: ${{ !cancelled() }}
         run: moodle-plugin-ci phpmd
 
-      - name: Moodle Code Checker
-        if: ${{ !cancelled() }}
-        run: moodle-plugin-ci phpcs --max-warnings 0
+      #- name: Moodle Code Checker
+      #  if: ${{ !cancelled() }}
+      #  run: moodle-plugin-ci phpcs --max-warnings 0
 
       - name: Moodle PHPDoc Checker
         if: ${{ !cancelled() }}

amd/build/courseformat/content.min.js

@@ -244,6 +244,10 @@ export default class Component extends BaseComponent {
             }
         }
 
+        if (element.component) {
+            return;
+        }
+
         // Update subtitle.
         target.querySelector(".section_subtitle").textContent = element.subtitle;
     }

amd/build/courseformat/content.min.js.map

@@ -36,7 +36,7 @@ export default class extends HeaderBase {
      */
     _isSectionBulkEnabled(bulk) {
         return super._isSectionBulkEnabled(bulk)
-            && (this.section.levelsan >= 2); // ADDED.
+            && (this.section.component || this.section.levelsan >= 2); // ADDED.
     }
 
 }

amd/build/courseformat/content/section/header.min.js

@@ -80,12 +80,12 @@ public function fmt_section_move_before(
         foreach ($ids as $id) {
             $originextra = $allsectionsextra[$id];
             $origins[] = $originextra;
-            for (/* ... */
+            for (
                 $originsubextra = $originextra; /* ... */
                 $originsubextra && ($originsubextra->id == $originextra->id
                                     || $originsubextra->levelsan > $originextra->levelsan); /* ... */
                 $originsubextra = $originsubextra->nextanyid ? $allsectionsextra[$originsubextra->nextanyid] : null
-            /* ... */) {
+            ) {
                 $subids[] = $originsubextra->id;
             }
         }
@@ -158,12 +158,12 @@ public function section_move_after(
         foreach ($ids as $id) {
             $originextra = $allsectionsextra[$id];
             $origins[] = $originextra;
-            for (/* ... */
+            for (
                 $originsubextra = $originextra; /* ... */
                 $originsubextra && ($originsubextra->id == $originextra->id
                                     || $originsubextra->levelsan > $originextra->levelsan); /* ... */
                 $originsubextra = $originsubextra->nextanyid ? $allsectionsextra[$originsubextra->nextanyid] : null
-            /* ... */) {
+            ) {
                 $subids[] = $originsubextra->id;
             }
         }
@@ -236,12 +236,12 @@ public function fmt_section_move_into(
         foreach ($ids as $id) {
             $originextra = $allsectionsextra[$id];
             $origins[] = $originextra;
-            for (/* ... */
+            for (
                 $originsubextra = $originextra; /* ... */
                 $originsubextra && ($originsubextra->id == $originextra->id
                                     || $originsubextra->levelsan > $originextra->levelsan); /* ... */
                 $originsubextra = $originsubextra->nextanyid ? $allsectionsextra[$originsubextra->nextanyid] : null
-            /* ... */) {
+            ) {
                 $subids[] = $originsubextra->id;
             }
         }
@@ -303,12 +303,12 @@ protected function set_section_visibility(
                 continue;
             }
             if (!$visible && $sectionextra->section || $visible && $sectionextra->parentvisiblesan) {
-                for (/* ... */
+                for (
                     $subsectionextra = $sectionextra; /* ... */
                     $subsectionextra && (($subsectionextra->id == $sectionextra->id)
                                         || ($subsectionextra->levelsan > $sectionextra->levelsan)); /* ... */
                     $subsectionextra = $subsectionextra->nextanyid ? $allsectionsextra[$subsectionextra->nextanyid] : null
-                /* ... */) {
+                ) {
                     if (($subsectionextra->id == $sectionextra->id) || !$visible) {
                         course_update_section($course, $subsectionextra->sectionbase, ['visible' => $visible]);
                     }