From 48f8812e29cbca1e69b9a7fbcfae34d5d1d92ea2 Mon Sep 17 00:00:00 2001 From: Anton Chuchkalov Date: Wed, 21 Oct 2015 15:00:37 +0300 Subject: [PATCH] #838: fix error in devops client related to deploy_envs deleting --- devops-service/app/api2/handlers/project.rb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/devops-service/app/api2/handlers/project.rb b/devops-service/app/api2/handlers/project.rb index a4d016a..e82616c 100644 --- a/devops-service/app/api2/handlers/project.rb +++ b/devops-service/app/api2/handlers/project.rb @@ -185,13 +185,15 @@ module Devops def delete_project id 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) - 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 '#{id}' is deleted" 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 '#{id}'. Deploy environment '#{deploy_env}' has been deleted" end