From 001d0f72a7ccbcf3b4587faa0602fae5d1f5a779 Mon Sep 17 00:00:00 2001
From: Paul Holden <paulh@moodle.com>
Date: Tue, 16 Sep 2025 09:54:15 +0100
Subject: [PATCH] MDL-86645 grade: account for text grade types determining
 element icon.

---
 grade/lib.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/grade/lib.php b/grade/lib.php
index 0f06321583a..cdd61527fc7 100644
--- a/grade/lib.php
+++ b/grade/lib.php
@@ -3879,15 +3879,14 @@ abstract class grade_helper {
 
                 $iscourse   = $element['object']->is_course_item();
                 $iscategory = $element['object']->is_category_item();
-                $isscale    = $element['object']->gradetype == GRADE_TYPE_SCALE;
-                $isvalue    = $element['object']->gradetype == GRADE_TYPE_VALUE;
+                $gradetype  = $element['object']->gradetype;
                 $isoutcome  = !empty($element['object']->outcomeid);
 
                 if ($element['object']->is_calculated()) {
                     $icon->pix = 'i/calc';
                     $icon->title = s(get_string('calculatedgrade', 'grades'));
 
-                } else if (($iscourse || $iscategory) && ($isscale || $isvalue)) {
+                } else if (($iscourse || $iscategory) && $gradetype != GRADE_TYPE_NONE) {
                     if ($category = $element['object']->get_item_category()) {
                         $aggrstrings = self::get_aggregation_strings();
                         $stragg = $aggrstrings[$category->aggregation];
@@ -3934,6 +3933,9 @@ abstract class grade_helper {
                         $icon->pix = 'i/manual_item';
                         $icon->title = s(get_string('manualitem', 'grades'));
                     }
+                } else {
+                    // No matching icon.
+                    $none = true;
                 }
                 break;