Don't break but report #199.

gjbarnard · Jan 19, 2024 · 4dbedc1 · 4dbedc1
1 parent 8be15fe
commit 4dbedc1
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 17 deletions.
diff --git a/classes/output/courseformat/content.php b/classes/output/courseformat/content.php
@@ -125,16 +125,20 @@ public function export_for_template(\renderer_base $output) {
                 $fs = get_file_storage();
                 $coursecontext = \context_course::instance($course->id);
                 foreach ($coursesectionimages as $coursesectionimage) {
-                    $replacement = $toolbox->check_displayed_image(
-                        $coursesectionimage,
-                        $course->id,
-                        $coursecontext->id,
-                        $coursesectionimage->sectionid,
-                        $format,
-                        $fs
-                    );
-                    if (!empty($replacement)) {
-                        $coursesectionimages[$coursesectionimage->id] = $replacement;
+                    try {
+                        $replacement = $toolbox->check_displayed_image(
+                            $coursesectionimage,
+                            $course->id,
+                            $coursecontext->id,
+                            $coursesectionimage->sectionid,
+                            $format,
+                            $fs
+                        );
+                        if (!empty($replacement)) {
+                            $coursesectionimages[$coursesectionimage->id] = $replacement;
+                        }
+                    } catch (\moodle_exception $me) {
+                        $coursesectionimages[$coursesectionimage->id]->imageerror = $me->getMessage();
                     }
                 }
             }
@@ -176,13 +180,18 @@ public function export_for_template(\renderer_base $output) {
             }
             foreach ($sectionsforgrid as $section) {
                 // Do we have an image?
-                if ((array_key_exists($section->id, $sectionimages)) && ($sectionimages[$section->id]->displayedimagestate >= 1)) {
-                    $sectionimages[$section->id]->imageuri = $toolbox->get_displayed_image_uri(
-                        $sectionimages[$section->id],
-                        $coursecontext->id,
-                        $section->id,
-                        $displayediswebp
-                    );
+                if (array_key_exists($section->id, $sectionimages)) {
+                    if ($sectionimages[$section->id]->displayedimagestate >= 1) {
+                        $sectionimages[$section->id]->imageuri = $toolbox->get_displayed_image_uri(
+                            $sectionimages[$section->id],
+                            $coursecontext->id,
+                            $section->id,
+                            $displayediswebp
+                        );
+                    } else if (empty($sectionimages[$section->id]->imageerror)) {
+                        $sectionimages[$section->id]->imageerror =
+                            get_string('cannotconvertuploadedimagetodisplayedimage', 'format_grid', json_encode($sectionimages[$section->id]));
+                    }
                 } else {
                     // No.
                     $sectionimages[$section->id] = new stdClass();

diff --git a/templates/grid.mustache b/templates/grid.mustache
@@ -99,6 +99,12 @@
                 {{#sectioncompletionmarkup}}{{{sectioncompletionmarkup}}}{{/sectioncompletionmarkup}}
             </div>
             {{/generatedimageuri}}
+            {{#imageerror}}
+            <div class="grid-image-error card-img-bottom text-center">
+                <p><small>{{imageerror}}</small></p>
+                {{#sectioncompletionmarkup}}{{{sectioncompletionmarkup}}}{{/sectioncompletionmarkup}}
+            </div>
+            {{/imageerror}}
         {{^popup}}
         {{#notavailable}}</div>{{/notavailable}}
         {{^notavailable}}</a>{{/notavailable}}

diff --git a/templates/local/content/section/content.mustache b/templates/local/content/section/content.mustache
@@ -136,6 +136,11 @@
         <div class="grid-generatedimage card-img text-center" style="background-image: url('{{generatedimageuri}}');">
         </div>
         {{/generatedimageuri}}
+        {{#imageerror}}
+        <div class="grid-image-error card-img text-center">
+            <p><small>{{imageerror}}</small></p>
+        </div>
+        {{/imageerror}}
         {{#image}}
         <div class="grid-image-name card-footer">
             {{image}}