Skip to content

Commit

Permalink
Fix permission checks for bulk delete actions (#7796)
Browse files Browse the repository at this point in the history
  • Loading branch information
SchrodingersGat authored Aug 3, 2024
1 parent 6fd5a99 commit 85fc709
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/frontend/src/tables/bom/BomTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -554,7 +554,7 @@ export function BomTable({
modelField: 'sub_part',
rowActions: rowActions,
enableSelection: !partLocked,
enableBulkDelete: !partLocked,
enableBulkDelete: !partLocked && user.hasDeleteRole(UserRoles.part),
enableDownload: true
}}
/>
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/src/tables/build/BuildAllocatedStockTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ export default function BuildAllocatedStockTable({
stock_detail: true,
supplier_detail: true
},
enableBulkDelete: true,
enableBulkDelete: user.hasDeleteRole(UserRoles.build),
enableDownload: true,
enableSelection: true,
rowActions: rowActions,
Expand Down
4 changes: 3 additions & 1 deletion src/frontend/src/tables/settings/ErrorTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { ApiEndpoints } from '../../enums/ApiEndpoints';
import { useDeleteApiFormModal } from '../../hooks/UseForm';
import { useTable } from '../../hooks/UseTable';
import { apiUrl } from '../../states/ApiState';
import { useUserState } from '../../states/UserState';
import { TableColumn } from '../Column';
import { InvenTreeTable } from '../InvenTreeTable';
import { RowAction, RowDeleteAction } from '../RowActions';
Expand All @@ -17,6 +18,7 @@ import { RowAction, RowDeleteAction } from '../RowActions';
*/
export default function ErrorReportTable() {
const table = useTable('error-report');
const user = useUserState();

const [error, setError] = useState<string>('');

Expand Down Expand Up @@ -90,7 +92,7 @@ export default function ErrorReportTable() {
tableState={table}
columns={columns}
props={{
enableBulkDelete: true,
enableBulkDelete: user.isStaff(),
enableSelection: true,
rowActions: rowActions,
onRowClick: (row) => {
Expand Down
4 changes: 3 additions & 1 deletion src/frontend/src/tables/settings/FailedTasksTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,13 @@ import { StylishText } from '../../components/items/StylishText';
import { ApiEndpoints } from '../../enums/ApiEndpoints';
import { useTable } from '../../hooks/UseTable';
import { apiUrl } from '../../states/ApiState';
import { useUserState } from '../../states/UserState';
import { TableColumn } from '../Column';
import { InvenTreeTable } from '../InvenTreeTable';

export default function FailedTasksTable() {
const table = useTable('tasks-failed');
const user = useUserState();

const [error, setError] = useState<string>('');

Expand Down Expand Up @@ -70,7 +72,7 @@ export default function FailedTasksTable() {
tableState={table}
columns={columns}
props={{
enableBulkDelete: true,
enableBulkDelete: user.isStaff(),
enableSelection: true,
onRowClick: (row: any) => {
setError(row.result);
Expand Down
4 changes: 3 additions & 1 deletion src/frontend/src/tables/settings/PendingTasksTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,13 @@ import { useMemo } from 'react';
import { ApiEndpoints } from '../../enums/ApiEndpoints';
import { useTable } from '../../hooks/UseTable';
import { apiUrl } from '../../states/ApiState';
import { useUserState } from '../../states/UserState';
import { TableColumn } from '../Column';
import { InvenTreeTable } from '../InvenTreeTable';

export default function PendingTasksTable() {
const table = useTable('tasks-pending');
const user = useUserState();

const columns: TableColumn[] = useMemo(() => {
return [
Expand Down Expand Up @@ -48,7 +50,7 @@ export default function PendingTasksTable() {
tableState={table}
columns={columns}
props={{
enableBulkDelete: true,
enableBulkDelete: user.isStaff(),
enableSelection: true
}}
/>
Expand Down

0 comments on commit 85fc709

Please sign in to comment.