projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '16838-probe-metrics' into master
[arvados.git]
/
apps
/
workbench
/
app
/
models
/
arvados_resource_list.rb
diff --git
a/apps/workbench/app/models/arvados_resource_list.rb
b/apps/workbench/app/models/arvados_resource_list.rb
index cbd544ebb798f8413d499748b59d57555fd48d7f..99502bd56ed04951695e8bcb15704b64ea4b46e5 100644
(file)
--- a/
apps/workbench/app/models/arvados_resource_list.rb
+++ b/
apps/workbench/app/models/arvados_resource_list.rb
@@
-147,11
+147,16
@@
class ArvadosResourceList
if not @results.nil?
@results.each(&block)
else
if not @results.nil?
@results.each(&block)
else
+ results = []
self.each_page do |items|
items.each do |i|
self.each_page do |items|
items.each do |i|
+ results << i
block.call i
end
end
block.call i
end
end
+ # Cache results only if all were retrieved (block didn't raise
+ # an exception).
+ @results = results
end
self
end
end
self
end