projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
9498: show top-level container requests in project#Pipelines_and_processes tab.
[arvados.git]
/
apps
/
workbench
/
app
/
controllers
/
projects_controller.rb
diff --git
a/apps/workbench/app/controllers/projects_controller.rb
b/apps/workbench/app/controllers/projects_controller.rb
index e49ed1fab65f38b6631c0298f8ba508feacd9087..3674e314a835742dc8071770fe771e41dcef7352 100644
(file)
--- a/
apps/workbench/app/controllers/projects_controller.rb
+++ b/
apps/workbench/app/controllers/projects_controller.rb
@@
-63,8
+63,8
@@
class ProjectsController < ApplicationController
}
pane_list <<
{
}
pane_list <<
{
- :name => '
Jobs_and_pipelin
es',
- :filters => [%w(uuid is_a) + [%w(arvados#
job
arvados#pipelineInstance)]]
+ :name => '
Pipelines_and_process
es',
+ :filters => [%w(uuid is_a) + [%w(arvados#
containerRequest
arvados#pipelineInstance)]]
}
pane_list <<
{
}
pane_list <<
{
@@
-213,9
+213,13
@@
class ProjectsController < ApplicationController
@name_link_for = {}
kind_filters.each do |attr,op,val|
(val.is_a?(Array) ? val : [val]).each do |type|
@name_link_for = {}
kind_filters.each do |attr,op,val|
(val.is_a?(Array) ? val : [val]).each do |type|
+ filters = @filters - kind_filters + [['uuid', 'is_a', type]]
+ if type == 'arvados#containerRequest'
+ filters = filters + [['container_requests.requesting_container_uuid', '=', nil]]
+ end
objects = @object.contents(order: @order,
limit: @limit,
objects = @object.contents(order: @order,
limit: @limit,
- filters:
(@filters - kind_filters + [['uuid', 'is_a', type]])
,
+ filters:
filters
,
)
objects.each do |object|
@name_link_for[object.andand.uuid] = objects.links_for(object, 'name').first
)
objects.each do |object|
@name_link_for[object.andand.uuid] = objects.links_for(object, 'name').first