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

fix(项目设置): 修改内置字段名称后，名称无法国际化

This commit is contained in:
AgAngle 2024-01-22 19:22:29 +08:00 committed by Craftsman
parent 036f580204
commit 4f6cbed856
4 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,7 +52,7 @@ public class ProjectCustomFieldService extends BaseCustomFieldService {
CustomField originCustomField = getWithCheck(customField.getId());
if (originCustomField.getInternal()) {
// 内置字段不能修改名字
originCustomField.setName(null);
customField.setName(null);
}
customField.setScopeId(originCustomField.getScopeId());
Project project = projectService.checkResourceExist(originCustomField.getScopeId());

9
backend/services/project-management/src/test/java/io/metersphere/project/controller/ProjectCustomFieldControllerTests.java
View File

@ -177,10 +177,13 @@ public class ProjectCustomFieldControllerTests extends BaseTest {
}
CustomFieldExample example = new CustomFieldExample();
example.createCriteria().andScopeIdEqualTo(DEFAULT_PROJECT_ID).andInternalEqualTo(true);
request = BeanUtils.copyBean(request, customFieldMapper.selectByExample(example).get(0));
this.requestPostWithOk(DEFAULT_UPDATE, request);
example.createCriteria().andScopeIdEqualTo(DEFAULT_PROJECT_ID).andNameEqualTo("functional_priority");
CustomFieldUpdateRequest internalRequest = BeanUtils.copyBean(new CustomFieldUpdateRequest(), customFieldMapper.selectByExample(example).get(0));
internalRequest.setName("aaaa");
this.requestPostWithOk(DEFAULT_UPDATE, internalRequest);
Assertions.assertEquals(customFieldMapper.selectByExample(example).get(0).getInternal(), true);
// 内置字段名称不能修改
Assertions.assertEquals(customFieldMapper.selectByExample(example).get(0).getName(), "functional_priority");
// @校验是否开启项目模板
changeOrgTemplateEnable(true);

2
backend/services/system-setting/src/main/java/io/metersphere/system/service/OrganizationCustomFieldService.java
View File

@ -83,7 +83,7 @@ public class OrganizationCustomFieldService extends BaseCustomFieldService {
CustomField originCustomField = getWithCheck(customField.getId());
if (originCustomField.getInternal()) {
// 内置字段不能修改名字
originCustomField.setName(null);
customField.setName(null);
}
checkOrganizationTemplateEnable(customField.getScopeId(), originCustomField.getScene());
customField.setScopeId(originCustomField.getScopeId());

9
backend/services/system-setting/src/test/java/io/metersphere/system/controller/OrganizationCustomFieldControllerTests.java
View File

@ -182,10 +182,13 @@ public class OrganizationCustomFieldControllerTests extends BaseTest {
assertRefCustomField(customField);
CustomFieldExample example = new CustomFieldExample();
example.createCriteria().andScopeIdEqualTo(DEFAULT_ORGANIZATION_ID).andInternalEqualTo(true);
request = BeanUtils.copyBean(request, customFieldMapper.selectByExample(example).get(0));
this.requestPostWithOk(DEFAULT_UPDATE, request);
example.createCriteria().andScopeIdEqualTo(DEFAULT_ORGANIZATION_ID).andNameEqualTo("functional_priority");
CustomFieldUpdateRequest internalRequest = BeanUtils.copyBean(new CustomFieldUpdateRequest(), customFieldMapper.selectByExample(example).get(0));
internalRequest.setName("aaaa");
this.requestPostWithOk(DEFAULT_UPDATE, internalRequest);
Assertions.assertEquals(customFieldMapper.selectByExample(example).get(0).getInternal(), true);
// 内置字段名称不能修改
Assertions.assertEquals(customFieldMapper.selectByExample(example).get(0).getName(), "functional_priority");
// @校验是否开启组织模板
changeOrgTemplateEnable(false);