test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(项目管理): 修复公共脚本日志记录key错误问题 

--bug=1039811 --user=王旭 【项目管理】日志-公共脚本删除，新建，编辑日志中无操作对象 https://www.tapd.cn/55049933/s/1504055
This commit is contained in:
WangXu10 2024-04-22 11:32:18 +08:00 committed by 刘瑞斌
parent a2da01b4d1
commit 2865447903
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
backend/services/project-management/src/main/java/io/metersphere/project/service/CustomFunctionLogService.java
View File

@ -42,7 +42,7 @@ public class CustomFunctionLogService {
null, null,
null, null,
OperationLogType.ADD.name(), OperationLogType.ADD.name(),
OperationLogModule.PROJECT_CUSTOM_FUNCTION, OperationLogModule.PROJECT_MANAGEMENT_COMMON_SCRIPT,
request.getName()); request.getName());
dto.setHistory(true); dto.setHistory(true);
dto.setPath("/project/custom/func/add"); dto.setPath("/project/custom/func/add");
@ -66,7 +66,7 @@ public class CustomFunctionLogService {
request.getId(), request.getId(),
null, null,
OperationLogType.UPDATE.name(), OperationLogType.UPDATE.name(),
OperationLogModule.PROJECT_CUSTOM_FUNCTION, OperationLogModule.PROJECT_MANAGEMENT_COMMON_SCRIPT,
request.getName()); request.getName());
dto.setHistory(true); dto.setHistory(true);
dto.setPath("/project/custom/func/update"); dto.setPath("/project/custom/func/update");
@ -86,7 +86,7 @@ public class CustomFunctionLogService {
customFunctionDTO.getId(), customFunctionDTO.getId(),
null, null,
OperationLogType.UPDATE.name(), OperationLogType.UPDATE.name(),
OperationLogModule.PROJECT_CUSTOM_FUNCTION, OperationLogModule.PROJECT_MANAGEMENT_COMMON_SCRIPT,
customFunctionDTO.getName()); customFunctionDTO.getName());
dto.setHistory(true); dto.setHistory(true);
dto.setPath("/project/custom/func/status" ); dto.setPath("/project/custom/func/status" );
@ -112,7 +112,7 @@ public class CustomFunctionLogService {
customFunctionDTO.getId(), customFunctionDTO.getId(),
null, null,
OperationLogType.DELETE.name(), OperationLogType.DELETE.name(),
OperationLogModule.PROJECT_CUSTOM_FUNCTION, OperationLogModule.PROJECT_MANAGEMENT_COMMON_SCRIPT,
customFunctionDTO.getName()); customFunctionDTO.getName());
dto.setHistory(true); dto.setHistory(true);
dto.setPath("/project/custom/func/delete"); dto.setPath("/project/custom/func/delete");

2
backend/services/project-management/src/main/java/io/metersphere/project/service/CustomFunctionService.java
View File

@ -174,7 +174,7 @@ public class CustomFunctionService {
*/ */
public List<OperationHistoryDTO> list(OperationHistoryRequest request) { public List<OperationHistoryDTO> list(OperationHistoryRequest request) {
OperationHistoryExample example = new OperationHistoryExample(); OperationHistoryExample example = new OperationHistoryExample();
example.createCriteria().andProjectIdEqualTo(request.getProjectId()).andModuleIn(List.of(OperationLogModule.PROJECT_CUSTOM_FUNCTION)) example.createCriteria().andProjectIdEqualTo(request.getProjectId()).andModuleIn(List.of(OperationLogModule.PROJECT_MANAGEMENT_COMMON_SCRIPT))
.andSourceIdEqualTo(request.getSourceId()); .andSourceIdEqualTo(request.getSourceId());
List<OperationHistory> history = operationHistoryMapper.selectByExample(example); List<OperationHistory> history = operationHistoryMapper.selectByExample(example);
if (org.apache.commons.collections4.CollectionUtils.isEmpty(history)) { if (org.apache.commons.collections4.CollectionUtils.isEmpty(history)) {

2
backend/services/system-setting/src/main/java/io/metersphere/system/log/constants/OperationLogModule.java
View File

@ -127,7 +127,7 @@ public class OperationLogModule {
public static final String PROJECT_MANAGEMENT_TEMPLATE_BUG_FIELD = "PROJECT_MANAGEMENT_TEMPLATE_API_FIELD"; public static final String PROJECT_MANAGEMENT_TEMPLATE_BUG_FIELD = "PROJECT_MANAGEMENT_TEMPLATE_API_FIELD";
public static final String PROJECT_MANAGEMENT_TEMPLATE_TEST_PLAN_FIELD = "PROJECT_MANAGEMENT_TEMPLATE_API_FIELD"; public static final String PROJECT_MANAGEMENT_TEMPLATE_TEST_PLAN_FIELD = "PROJECT_MANAGEMENT_TEMPLATE_API_FIELD";
public static final String PROJECT_CUSTOM_FUNCTION = "PROJECT_CUSTOM_FUNCTION";// 项目公共脚本 public static final String PROJECT_MANAGEMENT_COMMON_SCRIPT = "PROJECT_MANAGEMENT_COMMON_SCRIPT";// 项目公共脚本
//用例 //用例
public static final String FUNCTIONAL_CASE = "CASE_MANAGEMENT_CASE"; public static final String FUNCTIONAL_CASE = "CASE_MANAGEMENT_CASE";

2
frontend/src/config/pathMap.ts
View File

@ -718,7 +718,7 @@ export const pathMap: PathMapItem[] = [
level: MENU_LEVEL[2], level: MENU_LEVEL[2],
}, },
{ {
key: ' PROJECT_CUSTOM_FUNCTION', // 项目管理-公共脚本 key: 'PROJECT_MANAGEMENT_COMMON_SCRIPT', // 项目管理-公共脚本
locale: 'menu.projectManagement.commonScript', locale: 'menu.projectManagement.commonScript',
route: RouteEnum.PROJECT_MANAGEMENT_COMMON_SCRIPT, route: RouteEnum.PROJECT_MANAGEMENT_COMMON_SCRIPT,
permission: [], permission: [],