mirrors/nocobase
1
0
Fork 0
mirror of https://github.com/nocobase/nocobase synced 2024-11-15 05:57:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: acl permission check issue for 'Delete Event' action (#5002)
Some checks are pending
auto-merge / push-commit (push) Waiting to run
Details
Build Docker Image / build-and-push (push) Waiting to run
Details
Build Pro Image / build-and-push (push) Waiting to run
Details
deploy client docs / Build (push) Waiting to run
Details
E2E / Build (push) Waiting to run
Details
E2E / Core and plugins (push) Blocked by required conditions
Details
E2E / plugin-workflow (push) Blocked by required conditions
Details
E2E / plugin-workflow-approval (push) Blocked by required conditions
Details
E2E / plugin-data-source-main (push) Blocked by required conditions
Details
E2E / Comment on PR (push) Blocked by required conditions
Details
NocoBase Backend Test / sqlite-test (20, false) (push) Waiting to run
Details
NocoBase Backend Test / sqlite-test (20, true) (push) Waiting to run
Details
NocoBase Backend Test / postgres-test (public, 20, nocobase, false) (push) Waiting to run
Details
NocoBase Backend Test / postgres-test (public, 20, nocobase, true) (push) Waiting to run
Details
NocoBase Backend Test / postgres-test (public, 20, public, false) (push) Waiting to run
Details
NocoBase Backend Test / postgres-test (public, 20, public, true) (push) Waiting to run
Details
NocoBase Backend Test / postgres-test (user_schema, 20, nocobase, false) (push) Waiting to run
Details
NocoBase Backend Test / postgres-test (user_schema, 20, nocobase, true) (push) Waiting to run
Details
NocoBase Backend Test / postgres-test (user_schema, 20, public, false) (push) Waiting to run
Details
NocoBase Backend Test / postgres-test (user_schema, 20, public, true) (push) Waiting to run
Details
NocoBase Backend Test / mysql-test (20, false) (push) Waiting to run
Details
NocoBase Backend Test / mysql-test (20, true) (push) Waiting to run
Details
NocoBase Backend Test / mariadb-test (20, false) (push) Waiting to run
Details
NocoBase Backend Test / mariadb-test (20, true) (push) Waiting to run
Details
NocoBase FrontEnd Test / frontend-test (18) (push) Waiting to run
Details
Test on Windows / build (push) Waiting to run
Details

Browse Source 
* fix: delete Event action acl check

* chore: delete vent action
This commit is contained in:
Katherine 2024-08-07 10:09:58 +08:00 committed by GitHub
parent 0bfcfadc4d
commit 9df48ef0a1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/core/client/src/schema-initializer/items/index.tsx
View File

@ -19,7 +19,6 @@ export * from './CreateFilterActionInitializer';
export * from './CreateResetActionInitializer'; export * from './CreateResetActionInitializer';
export * from './CustomizeActionInitializer'; export * from './CustomizeActionInitializer';
export * from './DataBlockInitializer'; export * from './DataBlockInitializer';
export * from './DeleteEventActionInitializer';
export * from './G2PlotInitializer'; export * from './G2PlotInitializer';
export * from './InitializerWithSwitch'; export * from './InitializerWithSwitch';
export * from './RecordAssociationBlockInitializer'; export * from './RecordAssociationBlockInitializer';

4
packages/plugins/@nocobase/plugin-calendar/src/client/schema-initializer/initializers/CalendarFormActionInitializers.tsx
View File

@ -9,11 +9,11 @@
import { SchemaInitializer, SchemaInitializerItemType, useCollection_deprecated } from '@nocobase/client'; import { SchemaInitializer, SchemaInitializerItemType, useCollection_deprecated } from '@nocobase/client';
import { generateNTemplate } from '../../../locale'; import { generateNTemplate } from '../../../locale';
import { DeleteEventActionInitializer } from '../items/DeleteEventActionInitializer';
export const deleteEventActionInitializer: SchemaInitializerItemType<any> = { export const deleteEventActionInitializer: SchemaInitializerItemType<any> = {
name: 'deleteEvent', name: 'deleteEvent',
title: generateNTemplate('Delete Event'), title: generateNTemplate('Delete Event'),
Component: 'DeleteEventActionInitializer', Component: DeleteEventActionInitializer,
schema: { schema: {
'x-component': 'Action', 'x-component': 'Action',
'x-decorator': 'ACLActionProvider', 'x-decorator': 'ACLActionProvider',

3
packages/core/client/src/schema-initializer/items/DeleteEventActionInitializer.tsx → packages/plugins/@nocobase/plugin-calendar/src/client/schema-initializer/items/DeleteEventActionInitializer.tsx
View File

@ -8,12 +8,13 @@
*/ */
import React from 'react'; import React from 'react';
import { ActionInitializerItem } from './ActionInitializerItem'; import { ActionInitializerItem } from '@nocobase/client';
export const DeleteEventActionInitializer = (props) => { export const DeleteEventActionInitializer = (props) => {
const schema = { const schema = {
title: '{{ t("Delete Event") }}', title: '{{ t("Delete Event") }}',
'x-action': 'deleteEvent', 'x-action': 'deleteEvent',
'x-acl-action': 'destroy',
'x-component': 'Action', 'x-component': 'Action',
'x-designer': 'Action.Designer', 'x-designer': 'Action.Designer',
'x-component-props': { 'x-component-props': {

1
packages/plugins/@nocobase/plugin-calendar/src/client/schema-initializer/items/index.ts
View File

@ -9,3 +9,4 @@
export * from './CalendarBlockInitializer'; export * from './CalendarBlockInitializer';
export * from './RecordAssociationCalendarBlockInitializer'; export * from './RecordAssociationCalendarBlockInitializer';
export * from './DeleteEventActionInitializer';