projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
refs #10078
[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 44c85185c7c316a3f7d5efbb1c5566016b14348d..16212a8d0ad489b381aa3619d69d72443905cfcb 100644
(file)
--- a/
apps/workbench/app/controllers/projects_controller.rb
+++ b/
apps/workbench/app/controllers/projects_controller.rb
@@
-63,13
+63,13
@@
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 <<
{
:name => 'Pipeline_templates',
}
pane_list <<
{
:name => 'Pipeline_templates',
- :filters => [%w(uuid is_a
arvados#pipelineTemplate)
]
+ :filters => [%w(uuid is_a
) + [%w(arvados#pipelineTemplate arvados#workflow)]
]
}
pane_list <<
{
}
pane_list <<
{
@@
-184,7
+184,11
@@
class ProjectsController < ApplicationController
end
def find_objects_for_index
end
def find_objects_for_index
- @objects = all_projects
+ # We can use the all_projects helper, but we have to dup the
+ # result -- otherwise, when we apply our per-request filters and
+ # limits, they will infect the @all_projects cache too (see
+ # #6640).
+ @objects = all_projects.dup
super
end
super
end
@@
-209,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
@@
-222,23
+230,9
@@
class ProjectsController < ApplicationController
@objects = @objects.to_a.sort_by(&:created_at)
@objects.reverse! if nextpage_operator == '<='
@objects = @objects[0..@limit-1]
@objects = @objects.to_a.sort_by(&:created_at)
@objects.reverse! if nextpage_operator == '<='
@objects = @objects[0..@limit-1]
- @next_page_filters = @filters.reject do |attr,op,val|
- (attr == 'created_at' and op == nextpage_operator) or
- (attr == 'uuid' and op == 'not in')
- end
if @objects.any?
if @objects.any?
- last_created_at = @objects.last.created_at
-
- last_uuids = []
- @objects.each do |obj|
- last_uuids << obj.uuid if obj.created_at.eql?(last_created_at)
- end
-
- @next_page_filters += [['created_at',
- nextpage_operator,
- last_created_at]]
- @next_page_filters += [['uuid', 'not in', last_uuids]]
+ @next_page_filters = next_page_filters(nextpage_operator)
@next_page_href = url_for(partial: :contents_rows,
limit: @limit,
filters: @next_page_filters.to_json)
@next_page_href = url_for(partial: :contents_rows,
limit: @limit,
filters: @next_page_filters.to_json)