Unverified Commit d3990dfd authored by itbasketplayer's avatar itbasketplayer Committed by GitHub
Browse files

.gitignore remove taskInstance/index.vue(#2300) and no need to... 

.gitignore remove taskInstance/index.vue(#2300) and no need to findProcessDefineById 2 times(#2373) (#2374)

* some optimization

* revert

* ProcessDefinitionService#updateProcessDefinition findProcessDefineById 1 time
parent bd6adf28

.gitignore

+0 −1
Original line number Diff line number Diff line
@@ -145,6 +145,5 @@ dolphinscheduler-ui/dist/js/home/index.78a5d12.js.map 
dolphinscheduler-ui/dist/js/login/index.291b8e3.js

dolphinscheduler-ui/dist/js/login/index.291b8e3.js.map

dolphinscheduler-ui/dist/lib/external/

dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/index.vue

/dolphinscheduler-dao/src/main/resources/dao/data_source.properties

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionService.java

+4 −5
Original line number Diff line number Diff line
@@ -307,20 +307,19 @@ public class ProcessDefinitionService extends BaseDAGService { 
        if ((checkProcessJson.get(Constants.STATUS) != Status.SUCCESS)) {

            return checkProcessJson;

        }

        ProcessDefinition processDefinition = processService.findProcessDefineById(id);

        if (processDefinition == null) {

        ProcessDefinition processDefine = processService.findProcessDefineById(id);

        if (processDefine == null) {

            // check process definition exists

            putMsg(result, Status.PROCESS_DEFINE_NOT_EXIST, id);

            return result;

        } else if (processDefinition.getReleaseState() == ReleaseState.ONLINE) {

        } else if (processDefine.getReleaseState() == ReleaseState.ONLINE) {

            // online can not permit edit

            putMsg(result, Status.PROCESS_DEFINE_NOT_ALLOWED_EDIT, processDefinition.getName());

            putMsg(result, Status.PROCESS_DEFINE_NOT_ALLOWED_EDIT, processDefine.getName());

            return result;

        } else {

            putMsg(result, Status.SUCCESS);

        }



        ProcessDefinition processDefine = processService.findProcessDefineById(id);

        Date now = new Date();



        processDefine.setId(id);