[ARVADOS] updated: 62738e6c4087ad3001ea23bdb3e6b9c577701a55
git at public.curoverse.com
git at public.curoverse.com
Fri Jun 13 10:17:00 EDT 2014
Summary of changes:
.../app/controllers/pipeline_instances_controller.rb | 14 ++++++++------
apps/workbench/app/controllers/projects_controller.rb | 5 +++++
apps/workbench/app/views/application/_content.html.erb | 2 +-
apps/workbench/app/views/collections/show.html.erb | 10 +++++-----
apps/workbench/app/views/projects/_show_contents.html.erb | 2 +-
5 files changed, 20 insertions(+), 13 deletions(-)
via 62738e6c4087ad3001ea23bdb3e6b9c577701a55 (commit)
via 960c1ba3447a80e4c8e063a49f6275a5b7532bc9 (commit)
via 250fc95faf934e41d1b12e39a30a3dd0161bc955 (commit)
via 30dc7784acaaf392599227a2e4b91e62303f7cfb (commit)
from 55442fc4576a69bf41589a2572cda522227fb9ac (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 62738e6c4087ad3001ea23bdb3e6b9c577701a55
Author: Tom Clegg <tom at curoverse.com>
Date: Fri Jun 13 10:11:26 2014 -0400
2753: Fix param name (filter -> filters).
diff --git a/apps/workbench/app/views/collections/show.html.erb b/apps/workbench/app/views/collections/show.html.erb
index f3af64e..1097951 100644
--- a/apps/workbench/app/views/collections/show.html.erb
+++ b/apps/workbench/app/views/collections/show.html.erb
@@ -18,7 +18,7 @@
<% if @output_of.andand.any? %>
<p><i>This collection was the output of:</i><br />
<%= render_arvados_object_list_start(@output_of, 'Show all jobs',
- jobs_path(filter: [['output', '=', @object.uuid]].to_json)) do |job| %>
+ jobs_path(filters: [['output', '=', @object.uuid]].to_json)) do |job| %>
<%= link_to_if_arvados_object(job, friendly_name: true) %><br />
<% end %>
</p>
@@ -27,7 +27,7 @@
<% if @log_of.andand.any? %>
<p><i>This collection contains log messages from:</i><br />
<%= render_arvados_object_list_start(@log_of, 'Show all jobs',
- jobs_path(filter: [['log', '=', @object.uuid]].to_json)) do |job| %>
+ jobs_path(filters: [['log', '=', @object.uuid]].to_json)) do |job| %>
<%= link_to_if_arvados_object(job, friendly_name: true) %><br />
<% end %>
</p>
@@ -89,8 +89,8 @@
<% if @projects.andand.any? %>
<p>Included in projects:<br />
<%= render_arvados_object_list_start(@projects, 'Show all projects',
- links_path(filter: [['head_uuid', '=', @object.uuid],
- ['link_class', '=', 'name']].to_json)) do |project| %>
+ links_path(filters: [['head_uuid', '=', @object.uuid],
+ ['link_class', '=', 'name']].to_json)) do |project| %>
<%= link_to_if_arvados_object(project, friendly_name: true) %><br />
<% end %>
</p>
@@ -98,7 +98,7 @@
<% if @permissions.andand.any? %>
<p>Readable by:<br />
<%= render_arvados_object_list_start(@permissions, 'Show all permissions',
- links_path(filter: [['head_uuid', '=', @object.uuid],
+ links_path(filters: [['head_uuid', '=', @object.uuid],
['link_class', '=', 'permission']].to_json)) do |link| %>
<%= link_to_if_arvados_object(link.tail_uuid, friendly_name: true) %><br />
<% end %>
commit 960c1ba3447a80e4c8e063a49f6275a5b7532bc9
Author: Tom Clegg <tom at curoverse.com>
Date: Fri Jun 13 10:05:15 2014 -0400
2872: Redirect to parent project after deleting a subproject.
diff --git a/apps/workbench/app/controllers/projects_controller.rb b/apps/workbench/app/controllers/projects_controller.rb
index 8f6b96e..91d6e8a 100644
--- a/apps/workbench/app/controllers/projects_controller.rb
+++ b/apps/workbench/app/controllers/projects_controller.rb
@@ -60,6 +60,11 @@ class ProjectsController < ApplicationController
object.update_attributes! owner_uuid: current_user.uuid
end
end
+ if ArvadosBase::resource_class_for_uuid(@object.owner_uuid) == Group
+ params[:return_to] ||= group_path(@object.owner_uuid)
+ else
+ params[:return_to] ||= projects_path
+ end
super
end
diff --git a/apps/workbench/app/views/projects/_show_contents.html.erb b/apps/workbench/app/views/projects/_show_contents.html.erb
index bfd63dd..c3d509f 100644
--- a/apps/workbench/app/views/projects/_show_contents.html.erb
+++ b/apps/workbench/app/views/projects/_show_contents.html.erb
@@ -48,7 +48,7 @@
{ class: "btn btn-sm btn-primary arv-move-to-project", remote: true, method: 'get' }) do %>
<i class="fa fa-fw fa-truck"></i> Move project...
<% end %>
- <%= link_to(project_path(id: @object.uuid, return_to: projects_path), method: 'delete', class: 'btn btn-sm btn-primary', data: {confirm: "Really delete project '#{@object.name}'?"}) do %>
+ <%= link_to(project_path(id: @object.uuid), method: 'delete', class: 'btn btn-sm btn-primary', data: {confirm: "Really delete project '#{@object.name}'?"}) do %>
<i class="fa fa-fw fa-trash-o"></i> Delete project
<% end %>
<% end %>
commit 250fc95faf934e41d1b12e39a30a3dd0161bc955
Author: Tom Clegg <tom at curoverse.com>
Date: Fri Jun 13 10:01:11 2014 -0400
2872: Fix provenance graph double-smart-scroll.
diff --git a/apps/workbench/app/views/application/_content.html.erb b/apps/workbench/app/views/application/_content.html.erb
index bcea406..33ec16f 100644
--- a/apps/workbench/app/views/application/_content.html.erb
+++ b/apps/workbench/app/views/application/_content.html.erb
@@ -81,7 +81,7 @@
<% end %>
<% end %>
- <div id="<%= pane %>-scroll" class="<%= 'smart-scroll' if pane.match(/graph/) %>" style="margin-top:0.5em;">
+ <div id="<%= pane %>-scroll" style="margin-top:0.5em;">
<div class="pane-content">
<% if i == 0 %>
<%= render(partial: 'show_' + pane.downcase,
commit 30dc7784acaaf392599227a2e4b91e62303f7cfb
Author: Tom Clegg <tom at curoverse.com>
Date: Fri Jun 13 09:58:01 2014 -0400
2961: Fix crash on pipeline_instances/compare.
diff --git a/apps/workbench/app/controllers/pipeline_instances_controller.rb b/apps/workbench/app/controllers/pipeline_instances_controller.rb
index a4a9d69..97c5e17 100644
--- a/apps/workbench/app/controllers/pipeline_instances_controller.rb
+++ b/apps/workbench/app/controllers/pipeline_instances_controller.rb
@@ -173,12 +173,14 @@ class PipelineInstancesController < ApplicationController
@pipelines = @objects
- @prov_svg = ProvenanceHelper::create_provenance_graph provenance, "provenance_svg", {
- :request => request,
- :all_script_parameters => true,
- :combine_jobs => :script_and_version,
- :script_version_nodes => true,
- :pips => pips }
+ if provenance
+ @prov_svg = ProvenanceHelper::create_provenance_graph provenance, "provenance_svg", {
+ :request => request,
+ :all_script_parameters => true,
+ :combine_jobs => :script_and_version,
+ :script_version_nodes => true,
+ :pips => pips }
+ end
@object = @objects.first
end
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list