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

#742: fixed

Browse Source
This commit is contained in:
amartynov 2015-09-21 12:44:29 +03:00
parent f922c689e2
commit 1cccd2b5e7
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,6 +79,7 @@ module Devops
def add_or_update_deploy_env id, deploy_env def add_or_update_deploy_env id, deploy_env
project = Devops::Db.connector.project(id) project = Devops::Db.connector.project(id)
env = parser.add_or_update_deploy_env env = parser.add_or_update_deploy_env
env.identifier = deploy_env if env.identifier.nil?
begin begin
db_env = project.deploy_env(deploy_env) db_env = project.deploy_env(deploy_env)
unless env.identifier == deploy_env unless env.identifier == deploy_env
@ -90,6 +91,7 @@ module Devops
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("Can not change environment '#{deploy_env}' to '#{env.identifier}', environment '#{env.identifier}' already exist") unless deploy_env == env.identifier
rescue RecordNotFound => e rescue RecordNotFound => e
end end
env.validate!
project.delete_deploy_env(deploy_env) project.delete_deploy_env(deploy_env)
project.add_deploy_env(env) project.add_deploy_env(env)
"Deploy environment '#{deploy_env}' has been updated in project '#{project.id}'" "Deploy environment '#{deploy_env}' has been updated in project '#{project.id}'"

1
devops-service/db/mongo/connectors/project.rb
View File

@ -108,7 +108,6 @@ module Connectors
end end
def add_deploy_env_to_project id, env def add_deploy_env_to_project id, env
env.validate!
@collection.update({"_id" => id}, {'$push' => {deploy_envs: env.to_hash} }) @collection.update({"_id" => id}, {'$push' => {deploy_envs: env.to_hash} })
end end