From 07aa1349d8a988b316bfe966ab0a538abf70c3e2 Mon Sep 17 00:00:00 2001 From: Eric Leijonmarck Date: Fri, 1 Apr 2022 15:57:02 +0100 Subject: [PATCH] fix: error when licensing was not checked (#47201) --- public/app/features/serviceaccounts/ServiceAccountPage.tsx | 2 +- public/app/features/serviceaccounts/ServiceAccountsListPage.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/app/features/serviceaccounts/ServiceAccountPage.tsx b/public/app/features/serviceaccounts/ServiceAccountPage.tsx index 918c54102e0..f3b4469ddd5 100644 --- a/public/app/features/serviceaccounts/ServiceAccountPage.tsx +++ b/public/app/features/serviceaccounts/ServiceAccountPage.tsx @@ -77,7 +77,7 @@ const ServiceAccountPageUnconnected = ({ const serviceAccountId = parseInt(match.params.id, 10); loadServiceAccount(serviceAccountId); loadServiceAccountTokens(serviceAccountId); - if (contextSrv.accessControlEnabled()) { + if (contextSrv.licensedAccessControlEnabled()) { fetchACOptions(); } }, [match, loadServiceAccount, loadServiceAccountTokens, fetchACOptions]); diff --git a/public/app/features/serviceaccounts/ServiceAccountsListPage.tsx b/public/app/features/serviceaccounts/ServiceAccountsListPage.tsx index 14dbcca88e9..084fb7db9af 100644 --- a/public/app/features/serviceaccounts/ServiceAccountsListPage.tsx +++ b/public/app/features/serviceaccounts/ServiceAccountsListPage.tsx @@ -67,7 +67,7 @@ const ServiceAccountsListPage = ({ useEffect(() => { fetchServiceAccounts(); - if (contextSrv.accessControlEnabled()) { + if (contextSrv.licensedAccessControlEnabled()) { fetchACOptions(); } }, [fetchServiceAccounts, fetchACOptions]);