Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[fix-#3843][api]When update workflow definition,if name already exists, the prompt is not friendly #3918

Merged
merged 5 commits into from
Oct 15, 2020
Merged

[fix-#3843][api]When update workflow definition,if name already exists, the prompt is not friendly #3918

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f0ff8e2
[FIX_#3789][remote]cherry pick from dev to support netty heart beat
CalvinKirs Oct 12, 2020
b368c53
[FIX_#3789][remote]cherry pick from dev to support netty heart beat
lgcareer Oct 14, 2020
a703135
Merge remote-tracking branch 'remotes/upstream/1.3.3-release' into 1.…
lgcareer Oct 15, 2020
adda0eb
[fix-3843][api] When update workflow definition,if name already exist…
lgcareer Oct 15, 2020
ac9f5dc
[fix-3843][api] When update workflow definition,if name already exist…
lgcareer Oct 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/Status.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ public enum Status {
QUERY_TASK_INSTANCE_LOG_ERROR(10103,"view task instance log error", "查询任务实例日志错误"),
DOWNLOAD_TASK_INSTANCE_LOG_FILE_ERROR(10104,"download task instance log file error", "下载任务日志文件错误"),
CREATE_PROCESS_DEFINITION(10105,"create process definition", "创建工作流错误"),
VERIFY_PROCESS_DEFINITION_NAME_UNIQUE_ERROR(10106,"verify process definition name unique error", "工作流名称已存在"),
VERIFY_PROCESS_DEFINITION_NAME_UNIQUE_ERROR(10106,"verify process definition name unique error", "工作流定义名称已存在"),
UPDATE_PROCESS_DEFINITION_ERROR(10107,"update process definition error", "更新工作流定义错误"),
RELEASE_PROCESS_DEFINITION_ERROR(10108,"release process definition error", "上线工作流错误"),
QUERY_DATAIL_OF_PROCESS_DEFINITION_ERROR(10109,"query datail of process definition error", "查询工作流详细信息错误"),
Expand Down
17 changes: 13 additions & 4 deletions ...r-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,16 +382,25 @@ public Map<String, Object> updateProcessDefinition(User loginUser, String projec
return checkProcessJson;
}
ProcessDefinition processDefine = processService.findProcessDefineById(id);
// check process definition exists
if (processDefine == null) {
// check process definition exists
putMsg(result, Status.PROCESS_DEFINE_NOT_EXIST, id);
return result;
} else if (processDefine.getReleaseState() == ReleaseState.ONLINE) {
}

if (processDefine.getReleaseState() == ReleaseState.ONLINE) {
// online can not permit edit
putMsg(result, Status.PROCESS_DEFINE_NOT_ALLOWED_EDIT, processDefine.getName());
return result;
} else {
putMsg(result, Status.SUCCESS);
}

if (!name.equals(processDefine.getName())) {
// check whether the new process define name exist
ProcessDefinition definition = processDefineMapper.verifyByDefineName(project.getId(), name);
if (definition != null) {
putMsg(result, Status.VERIFY_PROCESS_DEFINITION_NAME_UNIQUE_ERROR, name);
return result;
}
}

Date now = new Date();
Expand Down