[ARVADOS] updated: 799e968ef79906bcd8b491f1ad99572b1cc21ccc
git at public.curoverse.com
git at public.curoverse.com
Tue Jun 10 13:31:56 EDT 2014
Summary of changes:
apps/workbench/app/controllers/collections_controller.rb | 6 +++---
apps/workbench/app/controllers/folders_controller.rb | 2 --
apps/workbench/app/views/collections/show.html.erb | 7 ++++++-
apps/workbench/app/views/layouts/application.html.erb | 2 +-
apps/workbench/app/views/users/_show_admin.html.erb | 2 --
apps/workbench/test/integration/users_test.rb | 3 ---
6 files changed, 10 insertions(+), 12 deletions(-)
via 799e968ef79906bcd8b491f1ad99572b1cc21ccc (commit)
via a314e176f65f97059b43f50a84814f4fe5e5d73d (commit)
via f883adf66c3da731904d5c25c779a13416ce9193 (commit)
via 2bd11a587ca12d8921042d86df4d095c79243dbc (commit)
via d687fed365e545dea1c9283e917e05bb2a4ed07c (commit)
from 92594178fbe4155f3122a1b0a52b5b3da995aabb (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 799e968ef79906bcd8b491f1ad99572b1cc21ccc
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Tue Jun 10 13:31:46 2014 -0400
2961: Removed calls to wait_for_ajax, fixes user tests.
diff --git a/apps/workbench/test/integration/users_test.rb b/apps/workbench/test/integration/users_test.rb
index 7651563..6646e5a 100644
--- a/apps/workbench/test/integration/users_test.rb
+++ b/apps/workbench/test/integration/users_test.rb
@@ -120,7 +120,6 @@ class UsersTest < ActionDispatch::IntegrationTest
assert has_text? 'Virtual Machine'
fill_in "repo_name", :with => "test_repo"
click_button "Submit"
- wait_for_ajax
end
assert page.has_text? 'modified_by_client_uuid'
@@ -139,7 +138,6 @@ class UsersTest < ActionDispatch::IntegrationTest
fill_in "repo_name", :with => "second_test_repo"
select("testvm.shell", :from => 'vm_uuid')
click_button "Submit"
- wait_for_ajax
end
assert page.has_text? 'modified_by_client_uuid'
@@ -204,7 +202,6 @@ class UsersTest < ActionDispatch::IntegrationTest
fill_in "repo_name", :with => "second_test_repo"
select("testvm.shell", :from => 'vm_uuid')
click_button "Submit"
- wait_for_ajax
end
assert page.has_text? 'modified_by_client_uuid'
commit a314e176f65f97059b43f50a84814f4fe5e5d73d
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Tue Jun 10 13:28:13 2014 -0400
2961: user-setup-modal-window div is no longer in footer_html because it is
loaded using AJAX.
diff --git a/apps/workbench/app/views/users/_show_admin.html.erb b/apps/workbench/app/views/users/_show_admin.html.erb
index f667f38..19c7cb9 100644
--- a/apps/workbench/app/views/users/_show_admin.html.erb
+++ b/apps/workbench/app/views/users/_show_admin.html.erb
@@ -18,6 +18,4 @@ account.</p>
<%= button_to "Deactivate #{@object.full_name}", unsetup_user_url(id: @object.uuid), class: 'btn btn-primary', data: {confirm: "Are you sure you want to deactivate #{@object.full_name}?"} %>
</blockquote>
-<% content_for :footer_html do %>
<div id="user-setup-modal-window" class="modal fade" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"></div>
-<% end %>
commit f883adf66c3da731904d5c25c779a13416ce9193
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Tue Jun 10 13:26:20 2014 -0400
2961: Don't call #render_index from #index on folders_controller because #index
is also used by #choose and the index does not have any tabs.
diff --git a/apps/workbench/app/controllers/folders_controller.rb b/apps/workbench/app/controllers/folders_controller.rb
index 10a5e45..8ebb1a3 100644
--- a/apps/workbench/app/controllers/folders_controller.rb
+++ b/apps/workbench/app/controllers/folders_controller.rb
@@ -74,8 +74,6 @@ class FoldersController < ApplicationController
@shared_folder_tree =
sorted_paths.call({'Shared with me' =>
buildtree.call(children_of, false)})
-
- render_index
end
def choose
commit 2bd11a587ca12d8921042d86df4d095c79243dbc
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Tue Jun 10 13:23:24 2014 -0400
2961: Do not include meta tag for websockets if there is no websockets in the
discovery document.
diff --git a/apps/workbench/app/views/layouts/application.html.erb b/apps/workbench/app/views/layouts/application.html.erb
index 3635546..2948ec2 100644
--- a/apps/workbench/app/views/layouts/application.html.erb
+++ b/apps/workbench/app/views/layouts/application.html.erb
@@ -14,7 +14,7 @@
<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
<meta name="description" content="">
<meta name="author" content="">
- <% if current_user %>
+ <% if current_user and $arvados_api_client.discovery[:websocketUrl] %>
<meta name="arv-websocket-url" content="<%=$arvados_api_client.discovery[:websocketUrl]%>?api_token=<%=Thread.current[:arvados_api_token]%>">
<% end %>
<meta name="robots" content="NOINDEX, NOFOLLOW">
commit d687fed365e545dea1c9283e917e05bb2a4ed07c
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Tue Jun 10 13:22:48 2014 -0400
2961: Fixed name of collection on collection show page to fix test.
diff --git a/apps/workbench/app/controllers/collections_controller.rb b/apps/workbench/app/controllers/collections_controller.rb
index 064acc6..6a5df87 100644
--- a/apps/workbench/app/controllers/collections_controller.rb
+++ b/apps/workbench/app/controllers/collections_controller.rb
@@ -143,10 +143,10 @@ class CollectionsController < ApplicationController
end
@output_of = jobs_with.call(output: @object.uuid)
@log_of = jobs_with.call(log: @object.uuid)
- folder_links = Link.limit(RELATION_LIMIT).order("modified_at DESC")
+ @folder_links = Link.limit(RELATION_LIMIT).order("modified_at DESC")
.where(head_uuid: @object.uuid, link_class: 'name').results
- folder_hash = Group.where(uuid: folder_links.map(&:tail_uuid)).to_hash
- @folders = folder_links.map { |link| folder_hash[link.tail_uuid] }
+ folder_hash = Group.where(uuid: @folder_links.map(&:tail_uuid)).to_hash
+ @folders = @folder_links.map { |link| folder_hash[link.tail_uuid] }
@permissions = Link.limit(RELATION_LIMIT).order("modified_at DESC")
.where(head_uuid: @object.uuid, link_class: 'permission',
name: 'can_read').results
diff --git a/apps/workbench/app/views/collections/show.html.erb b/apps/workbench/app/views/collections/show.html.erb
index 440d2ff..710388d 100644
--- a/apps/workbench/app/views/collections/show.html.erb
+++ b/apps/workbench/app/views/collections/show.html.erb
@@ -3,7 +3,12 @@
<div class="panel panel-info">
<div class="panel-heading">
<h3 class="panel-title">
- <% "Collection #{@object.uuid}" %>
+ <% i = 0 %>
+ <% @folder_links.each do |l| %>
+ <%= if i > 0 then ', ' end %>
+ <% i += 1 %>
+ <%= l.name %>
+ <% end %>
</h3>
</div>
<div class="panel-body">
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list