tim/fluke
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

#838: fix error in devops client related to deploy_envs deleting

Browse Source
This commit is contained in:
Anton Chuchkalov 2015-10-21 15:00:37 +03:00
parent ae667301db
commit 48f8812e29
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
devops-service/app/api2/handlers/project.rb
View File

@ -185,13 +185,15 @@ module Devops
def delete_project id def delete_project id
deploy_env = parser.delete deploy_env = parser.delete
servers = Devops::Db.connector.servers id
raise DependencyError.new "Deleting #{id} is forbidden: Project has servers" if !servers.empty?
project = Devops::Db.connector.project(id) project = Devops::Db.connector.project(id)
info = if deploy_env.nil? if deploy_env.nil?
servers = Devops::Db.connector.servers id
raise DependencyError.new "Deleting project #{id} is forbidden: Project has servers" unless servers.empty?
project.delete project.delete
"Project '#{id}' is deleted" "Project '#{id}' is deleted"
else else
servers = Devops::Db.connector.servers id, deploy_env
raise DependencyError.new "Deleting deploy_env #{deploy_env} is forbidden: Project has servers" unless servers.empty?
project.delete_deploy_env(deploy_env) project.delete_deploy_env(deploy_env)
"Project '#{id}'. Deploy environment '#{deploy_env}' has been deleted" "Project '#{id}'. Deploy environment '#{deploy_env}' has been deleted"
end end