[ARVADOS] updated: 3233ded01a1478b66828dafdd2abd8bad941b197
git at public.curoverse.com
git at public.curoverse.com
Mon Jan 5 09:10:08 EST 2015
Summary of changes:
apps/workbench/Gemfile | 15 +-
.../controllers/pipeline_instances_controller.rb | 20 +-
.../app/controllers/virtual_machines_controller.rb | 3 -
.../helpers/api_client_authorizations_helper.rb | 2 -
.../app/helpers/authorized_keys_helper.rb | 2 -
apps/workbench/app/helpers/groups_helper.rb | 2 -
apps/workbench/app/helpers/humans_helper.rb | 2 -
apps/workbench/app/helpers/job_tasks_helper.rb | 2 -
apps/workbench/app/helpers/keep_disks_helper.rb | 2 -
apps/workbench/app/helpers/links_helper.rb | 2 -
apps/workbench/app/helpers/logs_helper.rb | 2 -
apps/workbench/app/helpers/nodes_helper.rb | 2 -
apps/workbench/app/helpers/projects_helper.rb | 2 -
apps/workbench/app/helpers/repositories_helper.rb | 2 -
apps/workbench/app/helpers/sessions_helper.rb | 2 -
apps/workbench/app/helpers/specimens_helper.rb | 2 -
apps/workbench/app/helpers/traits_helper.rb | 2 -
.../app/helpers/user_agreements_helper.rb | 2 -
apps/workbench/app/helpers/users_helper.rb | 2 -
apps/workbench/app/helpers/vcf_pipeline_helper.rb | 234 ---------------------
.../app/helpers/virtual_machines_helper.rb | 2 -
.../app/views/authorized_keys/_show_help.html.erb | 10 -
apps/workbench/test/diagnostics_test_helper.rb | 7 +-
apps/workbench/test/performance_test_helper.rb | 16 +-
apps/workbench/test/test_helper.rb | 4 +
.../test/unit/api_client_authorization_test.rb | 7 -
apps/workbench/test/unit/authorized_key_test.rb | 7 -
apps/workbench/test/unit/human_test.rb | 7 -
apps/workbench/test/unit/job_task_test.rb | 7 -
apps/workbench/test/unit/keep_disk_test.rb | 4 -
apps/workbench/test/unit/log_test.rb | 7 -
apps/workbench/test/unit/node_test.rb | 7 -
apps/workbench/test/unit/pipeline_template_test.rb | 7 -
apps/workbench/test/unit/repository_test.rb | 7 -
apps/workbench/test/unit/specimen_test.rb | 7 -
apps/workbench/test/unit/trait_test.rb | 7 -
apps/workbench/test/unit/user_agreement_test.rb | 7 -
apps/workbench/test/unit/virtual_machine_test.rb | 7 -
sdk/cli/test/test_arv-get.rb | 2 +
sdk/go/keepclient/keepclient.go | 18 +-
sdk/go/keepclient/keepclient_test.go | 91 ++++----
sdk/go/keepclient/support.go | 69 +++---
sdk/python/bin/arv-get | 2 +-
sdk/python/setup.py | 2 +-
services/api/app/models/node.rb | 18 +-
.../20140422011506_pipeline_instance_state.rb | 9 +-
.../db/migrate/20141208164553_owner_uuid_index.rb | 20 ++
services/api/db/structure.sql | 139 +++++++++++-
services/api/test/unit/arvados_model_test.rb | 23 ++
services/fuse/setup.py | 2 +-
services/keepproxy/keepproxy.go | 42 +++-
services/keepproxy/keepproxy_test.go | 29 ++-
services/keepstore/handler_test.go | 18 +-
services/keepstore/handlers.go | 2 +-
services/keepstore/logging_router.go | 14 +-
services/nodemanager/arvnodeman/daemon.py | 11 +-
services/nodemanager/arvnodeman/jobqueue.py | 13 +-
services/nodemanager/arvnodeman/launcher.py | 21 +-
services/nodemanager/setup.py | 2 +-
services/nodemanager/tests/test_daemon.py | 55 +++--
services/nodemanager/tests/test_jobqueue.py | 22 +-
61 files changed, 466 insertions(+), 589 deletions(-)
delete mode 100644 apps/workbench/app/helpers/api_client_authorizations_helper.rb
delete mode 100644 apps/workbench/app/helpers/authorized_keys_helper.rb
delete mode 100644 apps/workbench/app/helpers/groups_helper.rb
delete mode 100644 apps/workbench/app/helpers/humans_helper.rb
delete mode 100644 apps/workbench/app/helpers/job_tasks_helper.rb
delete mode 100644 apps/workbench/app/helpers/keep_disks_helper.rb
delete mode 100644 apps/workbench/app/helpers/links_helper.rb
delete mode 100644 apps/workbench/app/helpers/logs_helper.rb
delete mode 100644 apps/workbench/app/helpers/nodes_helper.rb
delete mode 100644 apps/workbench/app/helpers/projects_helper.rb
delete mode 100644 apps/workbench/app/helpers/repositories_helper.rb
delete mode 100644 apps/workbench/app/helpers/sessions_helper.rb
delete mode 100644 apps/workbench/app/helpers/specimens_helper.rb
delete mode 100644 apps/workbench/app/helpers/traits_helper.rb
delete mode 100644 apps/workbench/app/helpers/user_agreements_helper.rb
delete mode 100644 apps/workbench/app/helpers/users_helper.rb
delete mode 100644 apps/workbench/app/helpers/vcf_pipeline_helper.rb
delete mode 100644 apps/workbench/app/helpers/virtual_machines_helper.rb
delete mode 100644 apps/workbench/app/views/authorized_keys/_show_help.html.erb
delete mode 100644 apps/workbench/test/unit/api_client_authorization_test.rb
delete mode 100644 apps/workbench/test/unit/authorized_key_test.rb
delete mode 100644 apps/workbench/test/unit/human_test.rb
delete mode 100644 apps/workbench/test/unit/job_task_test.rb
delete mode 100644 apps/workbench/test/unit/keep_disk_test.rb
delete mode 100644 apps/workbench/test/unit/log_test.rb
delete mode 100644 apps/workbench/test/unit/node_test.rb
delete mode 100644 apps/workbench/test/unit/pipeline_template_test.rb
delete mode 100644 apps/workbench/test/unit/repository_test.rb
delete mode 100644 apps/workbench/test/unit/specimen_test.rb
delete mode 100644 apps/workbench/test/unit/trait_test.rb
delete mode 100644 apps/workbench/test/unit/user_agreement_test.rb
delete mode 100644 apps/workbench/test/unit/virtual_machine_test.rb
create mode 100644 services/api/db/migrate/20141208164553_owner_uuid_index.rb
discards 648993083cc3339eab094be4dbccae7701d7664f (commit)
via 3233ded01a1478b66828dafdd2abd8bad941b197 (commit)
via c4e7c6d5a1a9604c1c1e53a5aa749eb1e45f92a1 (commit)
via 49b58cc43218106f1633c389598894d59447a26b (commit)
via 56ec5cfb4ee8c4d5a00bfd031e4c79c5e2263762 (commit)
via a1d0dc23b205d8593b31a4696260e5ef680ec72c (commit)
via e3087e7d734515124df0aef78389d9981264b5db (commit)
via c7112a98dca78b2e3cc892e0c5f0f02071ac6e50 (commit)
via b06785a74d28149b92f289d56fa55914375ddfcf (commit)
via 5aa470ef5aa86f7946be8d379e409deacfabba67 (commit)
via 604a84ddb5c4d410889c0d7ae9c7c15a595c181d (commit)
via 3212cecb5c090d2f331fd964a8855eaad508fdb9 (commit)
via 68c8b2056d6c72f0229cf29f999a8e0a1e4231f9 (commit)
via 4afcb8c40cf29b43a457b02123e8532b41df9afd (commit)
via 1e31ae09539d8265820a2f75f8a981f7d415ef58 (commit)
via 420d88e40bc5c2d12fe53a5f9f25ec19d80de797 (commit)
via d9ca40ab7cd6ab74fbfcd5287e9075a734107cd0 (commit)
via 0ab83774eb4a234eea75686dd257da4dd799aef8 (commit)
via dd476af362769999d6317bc48a84c35d4d340377 (commit)
via 2c62646581af6cc6d7858262a15ecd596730b3dd (commit)
via 1e7641831c41f9a7b27aa2672211f6d607e8ff8e (commit)
via f69395a08509cc8c664c3256019d4d3cdb67db86 (commit)
via c47e7b17f55d546b4158ab4b0d61b8f7e081ef57 (commit)
via 960e574bc6c559e67c12fc6ac844dd7aa6880051 (commit)
via 51bae325be042ecfc2469eb9838671e1663e6a99 (commit)
via 896d01ea7b3fed8b621ff930893d3ec806931dc9 (commit)
via 69f03366de186c5a337e5dd14e83920fcab38a8f (commit)
via 35016e091b321c41b6632d32a45f4b5591e98c67 (commit)
via 4d154281759194e776b4fd2fa925de5036c2a3f4 (commit)
via 3c92fedddb8ee6f804940a52955fce72311bac92 (commit)
via 14421881c1962fdfba49dc004cfc69c0637fe454 (commit)
via b12343e7eec124b34139efae07b52e95a74b253a (commit)
via bfc2351320afd0c440bda51b4b4a2c51ddd4b5ef (commit)
via 759878e0a72644c5e537c51da9806672cf92e458 (commit)
via fb2099b1de222b4aa05dd2ce12654ff32da3c18d (commit)
via 0b2005c4d8e1f8a5e1563373eb1eb49a908b7540 (commit)
via 84b88010ca9cc0802a9d4810a1a83c2946c64573 (commit)
via 155e542971974020412ad41d22e616290be5cc94 (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (648993083cc3339eab094be4dbccae7701d7664f)
\
N -- N -- N (3233ded01a1478b66828dafdd2abd8bad941b197)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
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 3233ded01a1478b66828dafdd2abd8bad941b197
Author: Brett Smith <brett at curoverse.com>
Date: Fri Dec 19 17:40:13 2014 -0500
4836: Fix infinite scroll loading in background tabs.
If an infinite scroller is in the first tab of a show page, but the
user is going to a different tab, we'll queue up the first event
to load data for the container, but when it fires the container won't
be visible so it will decline to load anything. Then you can only get
data to load if you resize the window.
Checking for container visibility was done in
ffa64c065ac8b28849395cf3e89fe93814252473, when maybe_load_more_content
would run on multiple containers. That was obsoleted in
4ad1947da490a998d68380b1520c4f95b1784676, when the function was
attached as an event handler to each container individually. Checking
for visibility is obsolete and can safely be removed.
diff --git a/apps/workbench/app/assets/javascripts/infinite_scroll.js b/apps/workbench/app/assets/javascripts/infinite_scroll.js
index 7bdf574..e97c9fc 100644
--- a/apps/workbench/app/assets/javascripts/infinite_scroll.js
+++ b/apps/workbench/app/assets/javascripts/infinite_scroll.js
@@ -18,7 +18,7 @@ function maybe_load_more_content(event) {
$container.attr('data-infinite-content-href'));
}
src = $container.attr('data-infinite-content-href');
- if (!src || !$container.is(':visible'))
+ if (!src)
// Finished
return;
diff --git a/apps/workbench/test/integration/projects_test.rb b/apps/workbench/test/integration/projects_test.rb
index 97e1a54..e5aa791 100644
--- a/apps/workbench/test/integration/projects_test.rb
+++ b/apps/workbench/test/integration/projects_test.rb
@@ -744,4 +744,15 @@ class ProjectsTest < ActionDispatch::IntegrationTest
assert match, 'Expected project name not found'
assert_text 'No description provided'
end
+
+ test "first tab loads data when visiting other tab directly" do
+ # As of 2014-12-19, the first tab of project#show uses infinite scrolling.
+ # Make sure that it loads data even if we visit another tab directly.
+ project = api_fixture("groups", "aproject")
+ visit(page_with_token("active_trustedclient",
+ "/projects/#{project['uuid']}#Advanced"))
+ assert_text("API response")
+ find("#page-wrapper .nav-tabs :first-child a").click
+ assert_text("bytes Collection")
+ end
end
diff --git a/apps/workbench/test/integration_helper.rb b/apps/workbench/test/integration_helper.rb
index febcfcf..2cf6bca 100644
--- a/apps/workbench/test/integration_helper.rb
+++ b/apps/workbench/test/integration_helper.rb
@@ -32,9 +32,11 @@ class ActionDispatch::IntegrationTest
# fixture, or passed as a raw string.
api_token = ((@@API_AUTHS.include? token) ?
@@API_AUTHS[token]['api_token'] : token)
- sep = (path.include? '?') ? '&' : '?'
+ path_parts = path.partition("#")
+ sep = (path_parts.first.include? '?') ? '&' : '?'
q_string = URI.encode_www_form('api_token' => api_token)
- "#{path}#{sep}#{q_string}"
+ path_parts.insert(1, "#{sep}#{q_string}")
+ path_parts.join("")
end
# Find a page element, but return false instead of raising an
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list