Skip to content

Commit b7919db

Browse files
committed
fix: Permission error
1 parent b15c43e commit b7919db

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

apps/trigger/views/trigger.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ class BatchDelete(APIView):
185185
RoleConstants.WORKSPACE_MANAGE.get_workspace_role(),
186186
)
187187
@log(
188-
menu="Trigger", operate="Delete the trigger",
188+
menu="Trigger", operate="Delete trigger in batches",
189189
get_operation_object=lambda r, k: get_trigger_operation_object_batch(r.data.get('id_list')),
190190
)
191191
def put(self, request: Request, workspace_id: str):

ui/src/permission/tool/workspace.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ const workspace = {
105105
trigger_read: (source_id:string) =>
106106
hasPermission(
107107
[
108-
new ComplexPermission([RoleConst.USER],[PermissionConst.APPLICATION.getApplicationWorkspaceResourcePermission(source_id)],[],'AND'),
108+
new ComplexPermission([RoleConst.USER],[PermissionConst.TOOL.getApplicationWorkspaceResourcePermission(source_id)],[],'AND'),
109109
RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,
110110
PermissionConst.TOOL_TRIGGER_READ.getWorkspacePermissionWorkspaceManageRole,
111111
PermissionConst.TOOL_TRIGGER_READ.getApplicationWorkspaceResourcePermission(source_id)
@@ -115,30 +115,30 @@ const workspace = {
115115
trigger_create: (source_id:string) =>
116116
hasPermission(
117117
[
118-
new ComplexPermission([RoleConst.USER],[PermissionConst.APPLICATION.getApplicationWorkspaceResourcePermission(source_id)],[],'AND'),
118+
new ComplexPermission([RoleConst.USER],[PermissionConst.TOOL.getToolWorkspaceResourcePermission(source_id)],[],'AND'),
119119
RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,
120120
PermissionConst.TOOL_TRIGGER_CREATE.getWorkspacePermissionWorkspaceManageRole,
121-
PermissionConst.TOOL_TRIGGER_CREATE.getApplicationWorkspaceResourcePermission(source_id)
121+
PermissionConst.TOOL_TRIGGER_CREATE.getToolWorkspaceResourcePermission(source_id)
122122
],
123123
'OR'
124124
),
125125
trigger_edit: (source_id: string) =>
126126
hasPermission(
127127
[
128-
new ComplexPermission([RoleConst.USER],[PermissionConst.APPLICATION.getApplicationWorkspaceResourcePermission(source_id)],[],'AND'),
128+
new ComplexPermission([RoleConst.USER],[PermissionConst.TOOL.getToolWorkspaceResourcePermission(source_id)],[],'AND'),
129129
RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,
130130
PermissionConst.TOOL_TRIGGER_EDIT.getWorkspacePermissionWorkspaceManageRole,
131-
PermissionConst.TOOL_TRIGGER_EDIT.getApplicationWorkspaceResourcePermission(source_id)
131+
PermissionConst.TOOL_TRIGGER_EDIT.getToolWorkspaceResourcePermission(source_id)
132132
],
133133
'OR'
134134
),
135135
trigger_delete: (source_id:string) =>
136136
hasPermission(
137137
[
138-
new ComplexPermission([RoleConst.USER],[PermissionConst.APPLICATION.getApplicationWorkspaceResourcePermission(source_id)],[],'AND'),
138+
new ComplexPermission([RoleConst.USER],[PermissionConst.TOOL.getToolWorkspaceResourcePermission(source_id)],[],'AND'),
139139
RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,
140140
PermissionConst.TOOL_TRIGGER_DELETE.getWorkspacePermissionWorkspaceManageRole,
141-
PermissionConst.TOOL_TRIGGER_DELETE.getApplicationWorkspaceResourcePermission(source_id)
141+
PermissionConst.TOOL_TRIGGER_DELETE.getToolWorkspaceResourcePermission(source_id)
142142
],
143143
'OR'
144144
),

0 commit comments

Comments
 (0)