Skip to content

Commit

Permalink
Resolve merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
mohammadranjbarz committed Mar 15, 2023
2 parents 740bc39 + 313562f commit 6e13387
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion src/server/adminBro.ts
Original file line number Diff line number Diff line change
Expand Up @@ -956,7 +956,9 @@ const getAdminBroInstance = async () => {
// component: false
},
delete: {
isVisible: false,
isVisible: true,
isAccessible: ({ currentAdmin }) =>
currentAdmin && currentAdmin.role === UserRole.ADMIN,
},
new: {
isAccessible: ({ currentAdmin }) =>
Expand Down Expand Up @@ -2219,6 +2221,7 @@ const getAdminBroInstance = async () => {
rootPath: adminBroRootPath,
});
};

interface AdminBroProjectsQuery {
statusId?: string;
title?: string;
Expand Down

0 comments on commit 6e13387

Please sign in to comment.