[ARVADOS] updated: 7c8e4a8d357ad8140eab83687c36cafd4e110e71
git at public.curoverse.com
git at public.curoverse.com
Fri May 23 17:32:41 EDT 2014
Summary of changes:
apps/workbench/app/assets/javascripts/editable.js | 4 +
.../app/assets/javascripts/pipeline_instances.js | 79 +--
apps/workbench/app/assets/javascripts/selection.js | 2 +-
.../app/assets/stylesheets/folders.css.scss | 5 +
.../app/controllers/application_controller.rb | 21 +-
.../app/controllers/collections_controller.rb | 48 +-
.../app/controllers/keep_services_controller.rb | 2 +
.../controllers/pipeline_instances_controller.rb | 6 +-
apps/workbench/app/helpers/application_helper.rb | 4 +-
.../app/models/{keep_disk.rb => keep_service.rb} | 2 +-
.../app/views/collections/_show_files.html.erb | 2 +-
.../app/views/collections/show_file_links.html.erb | 82 +++
apps/workbench/app/views/folders/_choose.html.erb | 4 +-
.../app/views/folders/_show_folders.html.erb | 2 +-
.../app/views/layouts/application.html.erb | 6 +-
.../pipeline_instances/_show_components.html.erb | 8 +-
.../_show_components_editable.html.erb | 2 +-
.../views/pipeline_instances/_show_inputs.html.erb | 50 ++
.../views/pipeline_templates/_show_recent.html.erb | 39 +-
apps/workbench/config/routes.rb | 4 +
apps/workbench/public/robots.txt | 2 -
.../test/functional/collections_controller_test.rb | 34 +-
.../workbench/test/integration/collections_test.rb | 27 +-
.../test/integration/pipeline_instances_test.rb | 56 ++
apps/workbench/test/integration/smoke_test.rb | 4 +
apps/workbench/test/integration_helper.rb | 21 +
apps/workbench/test/test_helper.rb | 1 +
doc/_config.yml | 2 +
doc/api/methods/keep_services.html.textile.liquid | 75 +++
doc/api/schema/KeepDisk.html.textile.liquid | 4 +-
doc/api/schema/KeepService.html.textile.liquid | 24 +
{services/keep => sdk/go}/build.sh | 9 +-
sdk/go/src/arvados.org/keepclient/hashcheck.go | 77 +++
.../src/arvados.org/keepclient/hashcheck_test.go | 85 +++
sdk/go/src/arvados.org/keepclient/keepclient.go | 206 +++++++
.../src/arvados.org/keepclient/keepclient_test.go | 677 +++++++++++++++++++++
sdk/go/src/arvados.org/keepclient/support.go | 255 ++++++++
sdk/go/src/arvados.org/streamer/streamer.go | 130 ++++
sdk/go/src/arvados.org/streamer/streamer_test.go | 366 +++++++++++
sdk/go/src/arvados.org/streamer/transfer.go | 308 ++++++++++
sdk/python/arvados/keep.py | 38 +-
sdk/python/run_test_server.py | 15 +-
.../arvados/v1/collections_controller.rb | 62 +-
.../app/controllers/arvados/v1/jobs_controller.rb | 4 +-
.../arvados/v1/keep_services_controller.rb | 21 +
.../api/app/models/api_client_authorization.rb | 2 +-
services/api/app/models/keep_disk.rb | 18 +-
services/api/app/models/keep_service.rb | 15 +
services/api/app/models/locator.rb | 84 +++
services/api/config/application.default.yml | 5 +
services/api/config/application.yml.example | 13 +
services/api/config/routes.rb | 3 +
.../migrate/20140519205916_create_keep_services.rb | 51 ++
services/api/db/schema.rb | 23 +-
.../test/fixtures/api_client_authorizations.yml | 7 +
services/api/test/fixtures/collections.yml | 8 +-
services/api/test/fixtures/jobs.yml | 20 +
services/api/test/fixtures/keep_disks.yml | 12 +-
services/api/test/fixtures/keep_services.yml | 23 +
services/api/test/fixtures/links.yml | 14 +
services/api/test/fixtures/pipeline_templates.yml | 4 +-
.../arvados/v1/collections_controller_test.rb | 216 +++++++
.../functional/arvados/v1/jobs_controller_test.rb | 15 +
.../arvados/v1/keep_disks_controller_test.rb | 34 +-
.../arvados/v1/keep_services_controller_test.rb | 23 +
services/api/test/integration/keep_proxy_test.rb | 25 +
.../api/test/unit/keep_service_test.rb | 2 +-
67 files changed, 3277 insertions(+), 215 deletions(-)
create mode 100644 apps/workbench/app/controllers/keep_services_controller.rb
copy apps/workbench/app/models/{keep_disk.rb => keep_service.rb} (70%)
create mode 100644 apps/workbench/app/views/collections/show_file_links.html.erb
create mode 100644 apps/workbench/app/views/pipeline_instances/_show_inputs.html.erb
create mode 100644 apps/workbench/test/integration/pipeline_instances_test.rb
create mode 100644 doc/api/methods/keep_services.html.textile.liquid
create mode 100644 doc/api/schema/KeepService.html.textile.liquid
copy {services/keep => sdk/go}/build.sh (85%)
create mode 100644 sdk/go/src/arvados.org/keepclient/hashcheck.go
create mode 100644 sdk/go/src/arvados.org/keepclient/hashcheck_test.go
create mode 100644 sdk/go/src/arvados.org/keepclient/keepclient.go
create mode 100644 sdk/go/src/arvados.org/keepclient/keepclient_test.go
create mode 100644 sdk/go/src/arvados.org/keepclient/support.go
create mode 100644 sdk/go/src/arvados.org/streamer/streamer.go
create mode 100644 sdk/go/src/arvados.org/streamer/streamer_test.go
create mode 100644 sdk/go/src/arvados.org/streamer/transfer.go
create mode 100644 services/api/app/controllers/arvados/v1/keep_services_controller.rb
create mode 100644 services/api/app/models/keep_service.rb
create mode 100644 services/api/app/models/locator.rb
create mode 100644 services/api/db/migrate/20140519205916_create_keep_services.rb
create mode 100644 services/api/test/fixtures/keep_services.yml
create mode 100644 services/api/test/functional/arvados/v1/keep_services_controller_test.rb
create mode 100644 services/api/test/integration/keep_proxy_test.rb
copy apps/workbench/test/unit/job_task_test.rb => services/api/test/unit/keep_service_test.rb (61%)
via 7c8e4a8d357ad8140eab83687c36cafd4e110e71 (commit)
via 56d21dc3d5823117729df3db6186da96f277b328 (commit)
via b28565c8aa08cbf70762fa69e49c5067fcb57e96 (commit)
via 140944b37fac0f631e8366222b2cbc5d5373ba8a (commit)
via e35cb0f48bbead47ad0c628c280bfc2cc32035ac (commit)
via d61f27791aa739dfc93c2f953236fffd4f0fcf6c (commit)
via 2099a0a3f0ef3371ba30ed0955bbc75ffa332701 (commit)
via d5823126a51b7c31915e01fee100abe9468014e5 (commit)
via c2e70e05178c9569e9de2ac5b3ef47440c49efc5 (commit)
via 3ba5aa15ea0156a4fce63dcb43b7f972b4c760df (commit)
via d54a48fa6fe94e9b80bf32c1d357e4dc3b3d67c3 (commit)
via 1b3750c9ffbec7a76b374023188c5c13882dc651 (commit)
via 25bdeb97230abe28b9d5d7b13aa72549d93df87b (commit)
via 45216b83b108a3c48cdd8b1aaf898ccd93188507 (commit)
via 32eafceeb044696ac7db49bbe1d6329e0e3785c0 (commit)
via 64d339fa3eb693908ea107a10a4c376ba3b51d7b (commit)
via 1f43dd857829bd1134837c43a8ac5d653c0c68b1 (commit)
via 123ce64a39849224481a67cc400a04c5022b639f (commit)
via 52056c365c8936e34bc6b22a01bcacb556737914 (commit)
via 83277602806099428b859b88745ad85836cd6ee4 (commit)
via a2c261dada5b47077c7930a2133bb000631fab66 (commit)
via dffa580d39b977746f6950b835b78b949a862c9d (commit)
via 1924b28c8f715bc08752fb219d1fd8145ccfe84f (commit)
via 0bec8ec8a130cb3af013b6097cf322938fce5671 (commit)
via fa6b0b65fb71b66e36f982f4f25e9751672d0834 (commit)
via 661b2bcd6269fae643fd7d0c46649715716959eb (commit)
via f876a32276a73d89ab695e5954c9ea3816b38db9 (commit)
via 2dc7f15f81ea7f460114482614d8ec5814c36fbf (commit)
via 35cd1ab03e06910a2536bb473529511b8af20b94 (commit)
via 49d953403625ca145081f9ccd914e70d49e51d49 (commit)
via c6a6693dc36615effca5e3363b81199362007c59 (commit)
via 38cef39fbdfeb8176e4c755d12e43a450e868439 (commit)
via 89096c06922b406f7157082de410e40960f5c73e (commit)
via 2f32f3483d18e9a89a8b5c13e022495c8681db04 (commit)
via 9d6ce80869e187a7c5a574ea5a5272bb89dd81ce (commit)
via e2dc7f5b9068e23822391bd3cf987b6f14e83ec0 (commit)
via 3986815ae5e7e61c48f3ed979c32358710ef7e20 (commit)
via a2273675f29a0f85cb80e62b3742e82d63c365e9 (commit)
via 64aac6153e1819738d9d80e156572aeb9bf07f97 (commit)
via 1797ee0dea063ff59361740ee512c84d086dacaf (commit)
via 040f1c94dfa1a53356d24e77afdbc0f2e5cfe91c (commit)
via ab710b74b2751f9a0d4eb5c5f950c6bb04865e79 (commit)
via 10bcbe8343f6f91f3c8e338a4a53766f7ba26ef1 (commit)
via 286c3627d978a7862b7f7eea366aa48ab930786d (commit)
via 2f27ee200f6cc4c97d30084e34330efef2068ebf (commit)
via 9c3beb526fe3bdfd6769abd0def5a1634074d353 (commit)
via ce2d2f5807822534756e52ac04bc272dd572d13d (commit)
via 50a277569ad6277d95b7e3be83ddefc7b92661f4 (commit)
via aad9cd74e61cff985944c400c40fe3f85907a1e7 (commit)
via efb58099eebde5bebb4cbfba9ce4ba70a142fc56 (commit)
via 941bcf698f1cfb498510a13f23d3c9d403b0435f (commit)
via 9482cf9f326ce64f9ea100aa34680278bdd6018e (commit)
via d3b11ddc2506de37b8e6538be69237d6d2a60a4a (commit)
via c3a88cbf511aa0954dac271ce6bda9c6e4f3191c (commit)
via 4ec57745d2106e955fea4442c9eccb2fce7246c4 (commit)
via b12f667daa270a4e3c656d16f30620ca763f9578 (commit)
via 27f5c1635d56c3f3cb6c5ef069c28db939eec2a1 (commit)
via b534e4a2b167185e59ca657369fee06e5effa6cc (commit)
via e678f2a0e5d223ddd5b2a6c6a8d14a8afa6d463d (commit)
via 2b19cf9f9522dd0e8774031a54ce695e73fb72fe (commit)
via fb7f238945e33b07f1c80b0623315c1ecf86bca2 (commit)
via 09559ebbb9f52c8b8a47e21d0a9c5720f3a2b7c6 (commit)
via 99cd188a0cbd9143b690750e21abc8d8d5e6dbad (commit)
via 2a493a9215f604c63ab7bc6f0e0956d10af8ef10 (commit)
via 66d5cdb1f34d614e5ecf1da5ef6efcad3a5a51ab (commit)
via 90bf8cae5f1ba931c7cc3be7864cad8ecca1ca5e (commit)
via 33d63c6d42e824744305df3e720f8e9cbcc87d78 (commit)
via 6022ddd1b07217b9b4f31e73493fc259bd19b696 (commit)
via 28195ca73b4c86e0f17ce2db74f3d5669d344e23 (commit)
via 717bee7044a2cd44678e13e116ec1be2a83cfe60 (commit)
via 952599738f3c9f8901c895858865fc90b5e30c1d (commit)
via 6132d8efbc522b71d0084160abaaa87031678bdc (commit)
from 7a82503a45c632918f8f032913dbbf6711a02e2e (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 7c8e4a8d357ad8140eab83687c36cafd4e110e71
Author: Tom Clegg <tom at curoverse.com>
Date: Fri May 23 17:32:21 2014 -0400
2760: Disambiguate "hover" from "selected" style. Do not highlight
non-selectable rows on hover.
diff --git a/apps/workbench/app/assets/stylesheets/folders.css.scss b/apps/workbench/app/assets/stylesheets/folders.css.scss
index 163c188..a033e87 100644
--- a/apps/workbench/app/assets/stylesheets/folders.css.scss
+++ b/apps/workbench/app/assets/stylesheets/folders.css.scss
@@ -6,3 +6,8 @@
.arv-folder-list > .row.folder:hover {
background: #d9edf7;
}
+.arv-folder-list > .row.folder.active,
+.arv-folder-list > .row.folder.active:hover {
+ background: #428bca;
+ color: #fff;
+}
diff --git a/apps/workbench/app/views/folders/_choose.html.erb b/apps/workbench/app/views/folders/_choose.html.erb
index 112739e..c27d669 100644
--- a/apps/workbench/app/views/folders/_choose.html.erb
+++ b/apps/workbench/app/views/folders/_choose.html.erb
@@ -12,12 +12,12 @@
<% [@my_folder_tree, @shared_folder_tree].each do |tree| %>
<% tree.each do |foldernode| %>
<% if foldernode[:object].is_a? String %>
- <div class="folder row" style="padding-left: <%= 1 + foldernode[:depth] %>em;">
+ <div class="row" style="padding-left: <%= 1 + foldernode[:depth] %>em;">
<i class="fa fa-fw fa-folder-open-o"></i>
<%= foldernode[:object] %>
</div>
<% else %>
- <div class="<%= 'selectable' if !params[:editable] || foldernode[:object].editable? %> folder row" style="padding-left: <%= 1 + foldernode[:depth] %>em;" data-object-uuid="<%= foldernode[:object].uuid %>">
+ <div class="<%= 'selectable folder' if !params[:editable] || foldernode[:object].editable? %> row" style="padding-left: <%= 1 + foldernode[:depth] %>em;" data-object-uuid="<%= foldernode[:object].uuid %>">
<i class="fa fa-fw fa-folder-o"></i>
<% if foldernode[:object].uuid == current_user.uuid %>
My Folders
diff --git a/apps/workbench/app/views/folders/_show_folders.html.erb b/apps/workbench/app/views/folders/_show_folders.html.erb
index 806aa01..2ecfd6e 100644
--- a/apps/workbench/app/views/folders/_show_folders.html.erb
+++ b/apps/workbench/app/views/folders/_show_folders.html.erb
@@ -2,7 +2,7 @@
<% [@my_folder_tree, @shared_folder_tree].each do |tree| %>
<% tree.each do |foldernode| %>
<% rowtype = foldernode[:object].class %>
- <div class="<%= 'folder' if rowtype != String %> row" style="padding-left: <%= 1 + foldernode[:depth] %>em;">
+ <div class="<%= 'folder' if rowtype == Group %> row" style="padding-left: <%= 1 + foldernode[:depth] %>em;">
<% if rowtype == String %>
<i class="fa fa-fw fa-folder-open-o"></i>
<%= foldernode[:object] %>
commit 56d21dc3d5823117729df3db6186da96f277b328
Merge: 7a82503 b28565c
Author: Tom Clegg <tom at curoverse.com>
Date: Fri May 23 17:12:33 2014 -0400
2760: Merge branch 'master' into 2760-folder-hierarchy
diff --cc apps/workbench/app/controllers/application_controller.rb
index 2b71eea,ade586c..59ca350
--- a/apps/workbench/app/controllers/application_controller.rb
+++ b/apps/workbench/app/controllers/application_controller.rb
@@@ -12,8 -11,8 +11,7 @@@ class ApplicationController < ActionCon
around_filter :thread_with_optional_api_token
before_filter :check_user_agreements, except: ERROR_ACTIONS
before_filter :check_user_notifications, except: ERROR_ACTIONS
- around_filter :using_reader_tokens, only: [:index, :show]
before_filter :find_object_by_uuid, except: [:index] + ERROR_ACTIONS
- before_filter :check_my_folders, :except => ERROR_ACTIONS
theme :select_theme
begin
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list