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

Merge branch 'CID-427-servers_table' into qa

Browse Source
This commit is contained in:
Anton Chuchkalov 2016-03-17 16:52:42 +02:00
commit 444138848b
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devops-service/app/api2/handlers/server.rb
View File

@ -27,8 +27,8 @@ module Devops
#scheduler = Rufus::Scheduler.new #scheduler = Rufus::Scheduler.new
def servers def servers
fields, reserved = parser.servers reserved = parser.servers
Devops::Db.connector.servers(nil, nil, nil, reserved, fields).map {|s| s.to_hash} Devops::Db.connector.servers(nil, nil, nil, reserved).map {|s| s.to_hash}
end end
def chef_servers def chef_servers

8
devops-service/app/api2/parsers/server.rb
View File

@ -6,13 +6,7 @@ module Devops
class ServerParser < RequestParser class ServerParser < RequestParser
def servers def servers
fields = [] (@params.key?("reserved") ? true : nil)
if @params.key?("fields") and @params["fields"].is_a?(Array)
Devops::Model::Server.fields.each do |k|
fields.push k if @params["fields"].include?(k)
end
end
return fields, (@params.key?("reserved") ? true : nil)
end end
def server def server