From ae667301dbfc2d4aa1654ef46c4cca1894c44666 Mon Sep 17 00:00:00 2001 From: Anton Chuchkalov Date: Wed, 21 Oct 2015 14:38:48 +0300 Subject: [PATCH] #837: change env renaming error messages --- devops-service/app/api2/handlers/project.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/devops-service/app/api2/handlers/project.rb b/devops-service/app/api2/handlers/project.rb index ee45024..a4d016a 100644 --- a/devops-service/app/api2/handlers/project.rb +++ b/devops-service/app/api2/handlers/project.rb @@ -119,11 +119,11 @@ module Devops begin unless env.identifier == deploy_env servers = Devops::Db.connector.servers_by_project_and_deploy_env(id, deploy_env) - raise InvalidRecord.new("Can not update environment '#{deploy_env}', there are #{servers.size} servers on it") unless servers.empty? + raise InvalidRecord.new("Environment '#{deploy_env}' can't be updated: it has #{servers.size} running servers.") unless servers.empty? end begin project.deploy_env(env.identifier) - raise InvalidRecord.new("Can not change environment '#{deploy_env}' to '#{env.identifier}', environment '#{env.identifier}' already exist") unless deploy_env == env.identifier + raise InvalidRecord.new("Environment '#{deploy_env}' can't be renamed to '#{env.identifier}', environment '#{env.identifier}' already exists") unless deploy_env == env.identifier rescue RecordNotFound => e end env.validate!