From ea3e2f096937d68dcbd217377e21cfe3773f2b24 Mon Sep 17 00:00:00 2001
From: Jaimos Skriletz <jaimosskriletz@gmail.com>
Date: Sun, 2 Feb 2025 15:21:43 -0700
Subject: [PATCH] Don't show use reward button when achievements are enabled
 but achievement items are disabled.

---
 lib/WeBWorK/AchievementItems.pm                               | 4 ++++
 .../ContentGenerator/ProblemSet/use_achievement_items.html.ep | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/WeBWorK/AchievementItems.pm b/lib/WeBWorK/AchievementItems.pm
index 696bb30aff..2249b66851 100644
--- a/lib/WeBWorK/AchievementItems.pm
+++ b/lib/WeBWorK/AchievementItems.pm
@@ -69,6 +69,10 @@ sub description ($self) { return $self->{description}; }
 # is paired with its input form to use the item.
 sub UserItems ($c, $userName, $set, $records) {
 	my $db = $c->db;
+	my $ce = $c->ce;
+
+	# Return unless achievement items are enabled.
+	return unless $ce->{achievementsEnabled} && $ce->{achievementItemsEnabled};
 
 	# When acting as another user, achievement items can be listed but not used.
 	return if $set && $userName ne $c->param('user');
diff --git a/templates/ContentGenerator/ProblemSet/use_achievement_items.html.ep b/templates/ContentGenerator/ProblemSet/use_achievement_items.html.ep
index 6e1a0ab5f7..7e16bb9763 100644
--- a/templates/ContentGenerator/ProblemSet/use_achievement_items.html.ep
+++ b/templates/ContentGenerator/ProblemSet/use_achievement_items.html.ep
@@ -1,4 +1,4 @@
-% last unless $c->ce->{achievementsEnabled};
+% last unless $ce->{achievementsEnabled} && $ce->{achievementItemsEnabled};
 %
 % my $achievementItems = $c->{achievementItems};
 % if ($achievementItems && @$achievementItems) {