projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '2044-share-button' refs #2766
[arvados.git]
/
services
/
api
/
app
/
controllers
/
arvados
/
v1
/
schema_controller.rb
diff --git
a/services/api/app/controllers/arvados/v1/schema_controller.rb
b/services/api/app/controllers/arvados/v1/schema_controller.rb
index 39aa024d58334f97c01f10731575837c25cd699b..5d907b89ac45a0fb6e6d1ddd66c86d7f507eb176 100644
(file)
--- a/
services/api/app/controllers/arvados/v1/schema_controller.rb
+++ b/
services/api/app/controllers/arvados/v1/schema_controller.rb
@@
-20,7
+20,7
@@
class Arvados::V1::SchemaController < ApplicationController
description: "The API to interact with Arvados.",
documentationLink: "http://doc.arvados.org/api/index.html",
protocol: "rest",
description: "The API to interact with Arvados.",
documentationLink: "http://doc.arvados.org/api/index.html",
protocol: "rest",
- baseUrl: root_url + "
/
arvados/v1/",
+ baseUrl: root_url + "arvados/v1/",
basePath: "/arvados/v1/",
rootUrl: root_url,
servicePath: "arvados/v1/",
basePath: "/arvados/v1/",
rootUrl: root_url,
servicePath: "arvados/v1/",
@@
-70,6
+70,12
@@
class Arvados::V1::SchemaController < ApplicationController
resources: {}
}
resources: {}
}
+ if Rails.application.config.websocket_address
+ discovery[:websocketUrl] = Rails.application.config.websocket_address
+ elsif ENV['ARVADOS_WEBSOCKETS']
+ discovery[:websocketUrl] = (root_url.sub /^http/, 'ws') + "websocket"
+ end
+
ActiveRecord::Base.descendants.reject(&:abstract_class?).each do |k|
begin
ctl_class = "Arvados::V1::#{k.to_s.pluralize}Controller".constantize
ActiveRecord::Base.descendants.reject(&:abstract_class?).each do |k|
begin
ctl_class = "Arvados::V1::#{k.to_s.pluralize}Controller".constantize
@@
-225,6
+231,16
@@
class Arvados::V1::SchemaController < ApplicationController
type: "string",
description: "Order in which to return matching #{k.to_s.underscore.pluralize}.",
location: "query"
type: "string",
description: "Order in which to return matching #{k.to_s.underscore.pluralize}.",
location: "query"
+ },
+ select: {
+ type: "array",
+ description: "Select which fields to return",
+ location: "query"
+ },
+ distinct: {
+ type: "boolean",
+ description: "Return each distinct object",
+ location: "query"
}
},
response: {
}
},
response: {