Skip to content

Commit

Permalink
Accept Merge Request spinnaker#1828: (mr/release/fix-application-dele…
Browse files Browse the repository at this point in the history
…te -> release)

Merge Request: 修复删除应用后未自动关闭弹窗并自动跳转到应用列表页

Created By: @马龙
Reviewed By: @郭学坤 @潘俊明
Approved By: @郭学坤 
Accepted By: @马龙
URL: https://codingcorp.coding.net/p/cd/d/orca/git/merge/1828
  • Loading branch information
马龙 committed Jun 17, 2020
2 parents 09d3dd5 + a6ebee0 commit 2cd0d32
Showing 1 changed file with 0 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -153,16 +153,6 @@ class TaskController {
@RequestMapping(value = "/tasks/{id}", method = RequestMethod.GET)
OrchestrationViewModel getTask(@PathVariable String id) {
Execution orchestration = executionRepository.retrieve(ORCHESTRATION, id)
if(orchestration.getStatus() == ExecutionStatus.SUCCEEDED) {
boolean hasPermission = fiatPermissionEvaluator.hasPermission(SecurityContextHolder.getContext().getAuthentication(),
orchestration.getApplication(),
'APPLICATION',
'READ')
if(!hasPermission) {
orchestration.setStatus(ExecutionStatus.RUNNING)
log.debug("==== task status changed from SUCCEEDED TO RUNNING ====")
}
}
OrchestrationViewModel result = convert orchestration
return result
}
Expand Down

0 comments on commit 2cd0d32

Please sign in to comment.