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

Merge branch 'bug_fix' of git.stu.neva.ru:cloudtechlab/devops-service into bug_fix

Browse Source
This commit is contained in:
Anton Chuchkalov 2015-11-25 18:09:25 +03:00
commit 35d871fb3f
1 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
devops-service/db/mongo/models/project.rb
View File

@ -39,7 +39,7 @@ module Devops
def initialize p={} def initialize p={}
self.id = p["name"] self.id = p["name"]
#raise InvalidRecord.new "No deploy envirenments for project #{self.id}" if p["deploy_envs"].nil? or p["deploy_envs"].empty? #raise InvalidRecord.new "No deploy environments for project #{self.id}" if p["deploy_envs"].nil? or p["deploy_envs"].empty?
self.type = p["type"] || Devops::GenericType.name self.type = p["type"] || Devops::GenericType.name
self.description = p["description"] self.description = p["description"]
self.archived = p["archived"] || false self.archived = p["archived"] || false
@ -73,34 +73,20 @@ module Devops
def add_authorized_user user, env=nil def add_authorized_user user, env=nil
return if user.nil? return if user.nil?
new_users = ( user.is_a?(Array) ? user : [ user ] ) new_users = ( user.is_a?(Array) ? user : [ user ] )
if env.nil? environments = env.nil? ? self.deploy_envs : [ self.deploy_env(env) ]
self.deploy_envs.each do |e| environments .each do |e|
return unless e.users.is_a?(Array)
e.add_users new_users
Devops::Db.connector.set_project_deploy_env_field(self.id, e.identifier, "users", e.users)
end
else
e = self.deploy_env(env)
return unless e.users.is_a?(Array)
e.add_users new_users e.add_users new_users
Devops::Db.connector.set_project_deploy_env_field(self.id, e.identifier, "users", e.users) Devops::Db.connector.set_project_deploy_env_field(self.id, e.identifier, {users: e.users})
end end
end end
def remove_authorized_user user, env=nil def remove_authorized_user user, env=nil
return if user.nil? return if user.nil?
users = ( user.is_a?(Array) ? user : [ user ] ) users = ( user.is_a?(Array) ? user : [ user ] )
if env.nil? environments = env.nil? ? self.deploy_envs : [ self.deploy_env(env) ]
self.deploy_envs.each do |e| environments.each do |e|
return unless e.users.is_a?(Array)
e.users = e.users - users
Devops::Db.connector.set_project_deploy_env_field(self.id, e.identifier, "users", e.users)
end
else
e = self.deploy_env(env)
return unless e.users.is_a?(Array)
e.users = e.users - users e.users = e.users - users
Devops::Db.connector.set_project_deploy_env_field(self.id, e.identifier, "users", e.users) Devops::Db.connector.set_project_deploy_env_field(self.id, e.identifier, {users: e.users})
end end
end end