Don't show use reward button when achievements are enabled but achiev…

…ement items are disabled.
openwebwork · Feb 2, 2025 · ea3e2f0 · ea3e2f0
1 parent 828f455
commit ea3e2f0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -1,4 +1,4 @@
-% last unless $c->ce->{achievementsEnabled};
+% last unless $ce->{achievementsEnabled} && $ce->{achievementItemsEnabled};
 %
 % my $achievementItems = $c->{achievementItems};
 % if ($achievementItems && @$achievementItems) {