[ARVADOS] updated: ae2787c96b41c3844193cba3e2dddffabd98be33
git at public.curoverse.com
git at public.curoverse.com
Wed Apr 8 09:57:50 EDT 2015
Summary of changes:
apps/workbench/app/helpers/application_helper.rb | 6 +++-
.../app/views/application/_content.html.erb | 2 +-
.../_show_components_running.html.erb | 7 ++++-
sdk/cli/bin/crunch-job | 34 +++++++++++++++++++---
sdk/ruby/arvados.gemspec | 2 +-
services/api/test/fixtures/pipeline_instances.yml | 12 ++++++++
6 files changed, 55 insertions(+), 8 deletions(-)
via ae2787c96b41c3844193cba3e2dddffabd98be33 (commit)
via 78e0599b0773976167ccb720fc1596236295337a (commit)
via e009f03d9f3a620f375cf187291bd12c2bf1d74c (commit)
via bae652c25653d21aece17e7137b375c0471b484e (commit)
via e1456a12e9b2daa5a7cae0daa7a952d71dd2dd1b (commit)
via 8dcbc531fdf79ab2e4eb29a6dad6dcd9fa103718 (commit)
via 83759d40b868f7583cffcfa986bb78ff9c9f6c42 (commit)
from f01af635017a4988e07252f81072d0d37a889298 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit ae2787c96b41c3844193cba3e2dddffabd98be33
Author: Radhika Chippada <radhika at curoverse.com>
Date: Wed Apr 8 09:43:23 2015 -0400
5365: trailing white space
diff --git a/apps/workbench/app/helpers/application_helper.rb b/apps/workbench/app/helpers/application_helper.rb
index 420ffba..449d823 100644
--- a/apps/workbench/app/helpers/application_helper.rb
+++ b/apps/workbench/app/helpers/application_helper.rb
@@ -185,7 +185,7 @@ module ApplicationHelper
if resource_class.andand.to_s == 'Collection'
if CollectionsHelper.match(attrvalue)
- readable = Collection.find? attrvalue
+ readable = Collection.find? attrvalue # portable_data_hash
else
readable = collections_for_object(attrvalue).any?
end
diff --git a/apps/workbench/app/views/pipeline_instances/_show_components_running.html.erb b/apps/workbench/app/views/pipeline_instances/_show_components_running.html.erb
index a1d3296..d9814a0 100644
--- a/apps/workbench/app/views/pipeline_instances/_show_components_running.html.erb
+++ b/apps/workbench/app/views/pipeline_instances/_show_components_running.html.erb
@@ -80,7 +80,7 @@
</p>
<%# Components %>
-
+
<%
job_uuids = pipeline_jobs.collect {|j| j[:job][:uuid]}.compact
if job_uuids.any?
commit 78e0599b0773976167ccb720fc1596236295337a
Merge: 8dcbc53 e009f03
Author: Radhika Chippada <radhika at curoverse.com>
Date: Wed Apr 8 09:37:18 2015 -0400
Merge branch 'master' into 5365-not-link-unreadables
commit 8dcbc531fdf79ab2e4eb29a6dad6dcd9fa103718
Author: Radhika Chippada <radhika at curoverse.com>
Date: Wed Apr 8 09:35:55 2015 -0400
5365: preload output collection uuids and jobs to help improve performance when loading large pipelines.
diff --git a/apps/workbench/app/helpers/application_helper.rb b/apps/workbench/app/helpers/application_helper.rb
index 5fc541c..420ffba 100644
--- a/apps/workbench/app/helpers/application_helper.rb
+++ b/apps/workbench/app/helpers/application_helper.rb
@@ -184,7 +184,11 @@ module ApplicationHelper
end
if resource_class.andand.to_s == 'Collection'
- readable = resource_class.find?(attrvalue)
+ if CollectionsHelper.match(attrvalue)
+ readable = Collection.find? attrvalue
+ else
+ readable = collections_for_object(attrvalue).any?
+ end
else
readable = object_for_dataclass(resource_class, attrvalue)
end
diff --git a/apps/workbench/app/views/application/_content.html.erb b/apps/workbench/app/views/application/_content.html.erb
index 1f7f2d2..03dff65 100644
--- a/apps/workbench/app/views/application/_content.html.erb
+++ b/apps/workbench/app/views/application/_content.html.erb
@@ -9,7 +9,7 @@
<% data_toggle = "tab" %>
<% tab_tooltip = "" %>
- <% if !current_user and pane_name == "Log"
+ <% if (pane_name == "Log") and (@object.owner_uuid != current_user)
if controller.model_class.to_s == 'Job'
if @object.log and !@object.log.empty?
logCollection = Collection.find? @object.log
diff --git a/apps/workbench/app/views/pipeline_instances/_show_components_running.html.erb b/apps/workbench/app/views/pipeline_instances/_show_components_running.html.erb
index e112a05..a1d3296 100644
--- a/apps/workbench/app/views/pipeline_instances/_show_components_running.html.erb
+++ b/apps/workbench/app/views/pipeline_instances/_show_components_running.html.erb
@@ -87,6 +87,11 @@
resource_class = resource_class_for_uuid(job_uuids.first, friendly_name: true)
preload_objects_for_dataclass resource_class, job_uuids
end
+
+ job_outputs = pipeline_jobs.collect {|j| j[:job][:output]}.compact
+ job_output_pdhs = job_outputs.select {|x| !(m = CollectionsHelper.match(x)).nil?}.compact
+ job_output_uuids = job_outputs - job_output_pdhs
+ preload_collections_for_objects job_output_uuids if job_output_uuids.any?
%>
<% pipeline_jobs.each_with_index do |pj, i| %>
diff --git a/services/api/test/fixtures/pipeline_instances.yml b/services/api/test/fixtures/pipeline_instances.yml
index d71585f..c1ec917 100644
--- a/services/api/test/fixtures/pipeline_instances.yml
+++ b/services/api/test/fixtures/pipeline_instances.yml
@@ -268,7 +268,13 @@ pipeline_in_publicly_accessible_project:
title: foo instance input
job:
uuid: zzzzz-8i9sb-jyq01m7in1jlofj
+ repository: active/foo
+ script: foo
script_version: master
+ script_parameters:
+ input:
+ dataclass: Collection
+ title: foo instance input
log: zzzzz-4zz18-4en62shvi99lxd4
output: b519d9cb706a29fc7ea24dbea2f05851+93
state: Complete
@@ -291,7 +297,13 @@ pipeline_in_publicly_accessible_project_but_other_objects_elsewhere:
title: foo instance input
job:
uuid: zzzzz-8i9sb-aceg2bnq7jt7kon
+ repository: active/foo
+ script: foo
script_version: master
+ script_parameters:
+ input:
+ dataclass: Collection
+ title: foo instance input
log: zzzzz-4zz18-bv31uwvy3neko21
output: zzzzz-4zz18-bv31uwvy3neko21
state: Complete
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list