From d5c7b9f8df96e5bafe09f6ee26cef1ba35b24603 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Mon, 20 Mar 2023 21:07:21 +0000 Subject: [PATCH] FIX: Badge granting recursion error (#20750) Moving the `grantBadge` action out of the actions hash caused it to clash with a method of the same name from the GrantBadgeController mixin. This commit renames the action. --- .../javascripts/admin/addon/controllers/admin-user-badges.js | 2 +- app/assets/javascripts/admin/addon/templates/user-badges.hbs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/admin/addon/controllers/admin-user-badges.js b/app/assets/javascripts/admin/addon/controllers/admin-user-badges.js index dc0ea3ba4f5..94058717159 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-user-badges.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-user-badges.js @@ -69,7 +69,7 @@ export default class AdminUserBadgesController extends Controller.extend( } @action - grantBadge() { + performGrantBadge() { this.grantBadge( this.selectedBadgeId, this.get("user.username"), diff --git a/app/assets/javascripts/admin/addon/templates/user-badges.hbs b/app/assets/javascripts/admin/addon/templates/user-badges.hbs index 9a0ea2252e3..702043e09c6 100644 --- a/app/assets/javascripts/admin/addon/templates/user-badges.hbs +++ b/app/assets/javascripts/admin/addon/templates/user-badges.hbs @@ -34,7 +34,7 @@