Skip to content

[Minor fix] : Removed extra checks from isAdmin variable in Footer.jsx #6021

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
rautniraj wants to merge 3 commits into from
Closed

[Minor fix] : Removed extra checks from isAdmin variable in Footer.jsx #6021

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5760cd2
Removed extra checks from isAdmin variable
rautniraj Mar 18, 2025
c111369
added missing conditional check to role
rautniraj Mar 18, 2025
51e9243
extended isAdmin logic to check role name as Administrator OR SuperAd…
May 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/javascript/components/rooms/room/shared_access/SharedAccess.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export default function SharedAccess() {
const deleteSharedAccess = useDeleteSharedAccess(friendlyId);
const { data: room } = useRoom(friendlyId);
const currentUser = useAuth();
const isAdmin = currentUser?.role.name === 'Administrator';
const isAdmin = currentUser?.role.name === 'Administrator' || currentUser?.role.name === 'SuperAdmin';

if (sharedUsers?.length || searchInput) {
return (
Expand Down
2 changes: 1 addition & 1 deletion app/javascript/components/shared_components/Footer.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export default function Footer() {
const { data: env } = useEnv();
const { data: links } = useSiteSetting(['Terms', 'PrivacyPolicy']);
const currentUser = useAuth();
const isAdmin = currentUser && currentUser.role && currentUser?.role.name === 'Administrator';
const isAdmin = currentUser?.role?.name === 'Administrator' || currentUser?.role?.name === 'SuperAdmin';

return (
<footer id="footer" className="footer background-whitesmoke text-center">
Expand Down
Loading