[ARVADOS] updated: 7276cc563eb93589279f58b045f893a7c3b83835
git at public.curoverse.com
git at public.curoverse.com
Tue May 6 13:42:17 EDT 2014
Summary of changes:
.../app/assets/javascripts/application.js | 1 -
apps/workbench/app/assets/javascripts/editable.js | 55 ++++-
apps/workbench/app/assets/javascripts/folders.js | 12 +
..._authorizations.js.coffee => folders.js.coffee} | 0
apps/workbench/app/assets/javascripts/selection.js | 18 +-
.../app/assets/stylesheets/application.css.scss | 72 +++--
.../app/assets/stylesheets/cards.css.scss | 85 +++++
.../{jobs.css.scss => folders.css.scss} | 2 +-
.../app/assets/stylesheets/sb-admin.css.scss | 164 ++++++++++
.../workbench/app/assets/stylesheets/selection.css | 22 +-
.../app/controllers/actions_controller.rb | 42 ++-
.../app/controllers/application_controller.rb | 47 ++-
.../app/controllers/collections_controller.rb | 1 -
.../app/controllers/folders_controller.rb | 99 ++++++
.../workbench/app/controllers/groups_controller.rb | 7 +-
apps/workbench/app/helpers/application_helper.rb | 21 +-
apps/workbench/app/helpers/folders_helper.rb | 2 +
.../app/helpers/pipeline_instances_helper.rb | 1 -
apps/workbench/app/models/arvados_base.rb | 48 +++-
apps/workbench/app/models/arvados_resource_list.rb | 6 +
apps/workbench/app/models/collection.rb | 5 +
apps/workbench/app/models/group.rb | 10 +
apps/workbench/app/models/log.rb | 5 +
.../app/views/application/_content.html.erb | 2 +-
.../application/_delete_object_button.html.erb | 2 +-
.../views/application/_show_object_button.html.erb | 3 +
.../app/views/application/_show_recent.html.erb | 21 +-
.../workbench/app/views/application/index.html.erb | 6 +-
.../app/views/folders/_show_my_folders.html.erb | 2 +
.../views/folders/_show_shared_with_me.html.erb | 2 +
.../workbench/app/views/folders/remove_item.js.erb | 5 +
apps/workbench/app/views/folders/show.html.erb | 193 ++++++++++++
.../app/views/layouts/application.html.erb | 321 ++++++++++----------
apps/workbench/app/views/logs/show.html.erb | 1 -
apps/workbench/config/routes.rb | 3 +
.../folders_controller_test.rb} | 2 +-
apps/workbench/test/integration/folders_test.rb | 48 +++
apps/workbench/test/integration/smoke_test.rb | 2 +-
apps/workbench/test/integration/users_test.rb | 51 ++--
.../test/integration/virtual_machines_test.rb | 4 +-
apps/workbench/test/integration_helper.rb | 12 +
.../test/unit/helpers/folders_helper_test.rb | 4 +
.../api/app/controllers/application_controller.rb | 67 ----
.../controllers/arvados/v1/groups_controller.rb | 68 ++++
services/api/app/models/arvados_model.rb | 18 ++
services/api/app/models/group.rb | 1 +
services/api/test/fixtures/specimens.yml | 18 ++
.../arvados/v1/groups_controller_test.rb | 37 +++
48 files changed, 1249 insertions(+), 369 deletions(-)
create mode 100644 apps/workbench/app/assets/javascripts/folders.js
copy apps/workbench/app/assets/javascripts/{api_client_authorizations.js.coffee => folders.js.coffee} (100%)
create mode 100644 apps/workbench/app/assets/stylesheets/cards.css.scss
copy apps/workbench/app/assets/stylesheets/{jobs.css.scss => folders.css.scss} (64%)
create mode 100644 apps/workbench/app/assets/stylesheets/sb-admin.css.scss
create mode 100644 apps/workbench/app/controllers/folders_controller.rb
create mode 100644 apps/workbench/app/helpers/folders_helper.rb
create mode 100644 apps/workbench/app/views/application/_show_object_button.html.erb
create mode 100644 apps/workbench/app/views/folders/_show_my_folders.html.erb
create mode 100644 apps/workbench/app/views/folders/_show_shared_with_me.html.erb
create mode 100644 apps/workbench/app/views/folders/remove_item.js.erb
create mode 100644 apps/workbench/app/views/folders/show.html.erb
delete mode 100644 apps/workbench/app/views/logs/show.html.erb
copy apps/workbench/test/{unit/job_test.rb => functional/folders_controller_test.rb} (57%)
create mode 100644 apps/workbench/test/integration/folders_test.rb
create mode 100644 apps/workbench/test/unit/helpers/folders_helper_test.rb
via 7276cc563eb93589279f58b045f893a7c3b83835 (commit)
via fc4428224984cb71b961d17410205b535153c7f2 (commit)
via 385ce6601ff872a0a4124071ef39869a4d3cfd53 (commit)
via 32ca1dc4da9100a1a698d33a46c2919cf53fe606 (commit)
via a848b6ea430ee2b2c1daee80e846d4d3bd594920 (commit)
via 16c58b75712ad4332d55e490d20b3946d2e05008 (commit)
via 722e0c17507cc1fd21df7fafa43cc88965c092d8 (commit)
via 79f70f03efbfca59ea80b344e56aa29ac1e72c47 (commit)
via 1b1ddccffecf6e3d44aa2e1a632b54601ce282b6 (commit)
via aa0e6250280b5ac587b816f92127bae079d62dbc (commit)
via db1e389b74e37ecf4915168acdc72ea9ef624d9c (commit)
via 43bcfeaa2d9953ff03f34c65b95be9e386152362 (commit)
via 7871e324112f24527031f4100e4131ff2c6ab245 (commit)
via c52a78b386adeebf33c618b669f33ca87c466eee (commit)
via 3e9576ef93a4d86882147b34ef9a28016375b865 (commit)
via ec56622b42f85aef2b4e8811378f8c99a6df24ea (commit)
via c6ad75e4241247ac18f5a5a8c397537dc6be1e3c (commit)
via 02b233b2eb80de1b234f3658d86a0e446e33a032 (commit)
via 428abec08e6ec59c38b7dc640396db950d42702b (commit)
via 6ada98b925a7b82a87446aacd0f6cca28df1b510 (commit)
via 11c6f1d759040f2af8a68d80ae78dd57a9b2d976 (commit)
via f263c987ad0b144393edd28f281c5b19e84fdf0b (commit)
via b8dc9c22c0a76b5ed8b36a42d06c45bd3069b6f5 (commit)
via a8fd97bee8b0d194a7013dffa0c8bfb8533e669b (commit)
via 20cbe1178d370b71e7df2650afa7d6dc7e8c73b8 (commit)
via 4b9281d9e47bf308d229ca4dde8af499a6674c9c (commit)
via 7f3b351ccea1beee195c1176be229ffa6d104d3e (commit)
via c19ef999c3b938e6d3cdc3746fab5bad8aba3403 (commit)
via c8444a1f49cb77bc32f62135247f12301f4927d7 (commit)
via 70fa68ef9087dd85d6e18fba2ef11f94ddeb95a4 (commit)
via 4aee1d7246e344099fe7e10264d009e49aeafee0 (commit)
via d02c4efcfdbe8f21fba895749988b14b7db41310 (commit)
via ec824d69dee0696b1ca4748fbe5b912634940d53 (commit)
via 76b9eebf07b424ec2a8fde9b7760b8ce499063bc (commit)
via ac317fea1f11179b33eae7e06a60ba60df218f1c (commit)
via 568ea04cdde8988a675754372f618d937d3757e0 (commit)
via fca1b2bd47910761f0c2603e72681670443e4be8 (commit)
via 4c19fb79d7b96bc18a1843182d3675c7a4de683d (commit)
via f23a72b89383c797663b5ec77d342bab20f239f4 (commit)
via 6177a6474c312d5d5b9c1f0eaa3ebd089a64b5f1 (commit)
via 9820178bf518d9ddace8c27ea383e5c37d86c8fe (commit)
via b7161fff2cb2fdd2bc0975c75f1fbc32f625343b (commit)
via 5d5c69bb5a60127aa509fac4bdfb8ea915eacadc (commit)
via 0e69f5346c474da7b2244546db4476f8ca21946f (commit)
via 3063c6106a83102214deb9d86ec621c0bb85d4b7 (commit)
via c623120453858c2ce47ab135f250c33a627a344d (commit)
via 20347d900fb2d75a3f3eef91d4da17a559b0ecd6 (commit)
via f107a5232d5e8788ae19daf1c5f6639f0c3cdb68 (commit)
via 7df1885cee1d6eb0f65a010f13ca7e9ff59c80d9 (commit)
via c66afecd36cf7d91223b5db79f3e120954f8217d (commit)
via cc22cd28f536fa6fd95732372177d36a94a4c08d (commit)
via d39470cbc160b9d51033a564e0b8867388a5a1d3 (commit)
via 1c45ed6a43b01a4f216cf8877b35d9ad18e1c5b5 (commit)
via 420949e37a2903ab87f64f57278dfdc6a261a7f3 (commit)
via 2943d9c3622e2c5bca081dc48fd5d8d148dac386 (commit)
via bd240259a9d95a4da53eb0ff8a3644d7acd7705d (commit)
via e35fb48f1485a92a64a30efe8b1c43a179b70260 (commit)
via 7e8f99556391cc81c014b517a9fa6efed8fe8113 (commit)
via 2f3e496712802324e5d184f9ae59866df1772ef0 (commit)
via bf15373590e21dafd696fa0c10906eb653610d1d (commit)
via 8086f73aca674d7533e88bdd3850042553487d2b (commit)
via 8b77f66275fd87f70dd79075a71d8062311541bc (commit)
via 57dc9e64bb38f186e2b235a98d7437a5f986bc83 (commit)
via d7ccebe29c68df51633f6a18eba6aa6a982c3739 (commit)
from f8ba79b88683be984913e28677c4522ca21019aa (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 7276cc563eb93589279f58b045f893a7c3b83835
Author: Tom Clegg <tom at curoverse.com>
Date: Tue May 6 13:10:05 2014 -0400
Remove stray debug puts.
diff --git a/apps/workbench/app/controllers/collections_controller.rb b/apps/workbench/app/controllers/collections_controller.rb
index a64ac11..4178e38 100644
--- a/apps/workbench/app/controllers/collections_controller.rb
+++ b/apps/workbench/app/controllers/collections_controller.rb
@@ -159,7 +159,6 @@ class CollectionsController < ApplicationController
end
Collection.where(uuid: @object.uuid).each do |u|
- puts request
@prov_svg = ProvenanceHelper::create_provenance_graph(u.provenance, "provenance_svg",
{:request => request,
:direction => :bottom_up,
diff --git a/apps/workbench/app/helpers/pipeline_instances_helper.rb b/apps/workbench/app/helpers/pipeline_instances_helper.rb
index bb0ff74..e3a2b62 100644
--- a/apps/workbench/app/helpers/pipeline_instances_helper.rb
+++ b/apps/workbench/app/helpers/pipeline_instances_helper.rb
@@ -30,7 +30,6 @@ module PipelineInstancesHelper
i = -1
object.components.each do |cname, c|
- puts cname, c
i += 1
pj = {index: i, name: cname}
pj[:job] = c[:job].is_a?(Hash) ? c[:job] : {}
commit fc4428224984cb71b961d17410205b535153c7f2
Merge: f8ba79b 385ce66
Author: Tom Clegg <tom at curoverse.com>
Date: Tue May 6 13:01:44 2014 -0400
Merge branch '1970-folder-view'
closes #1970
commit 385ce6601ff872a0a4124071ef39869a4d3cfd53
Merge: 32ca1dc f8ba79b
Author: Tom Clegg <tom at curoverse.com>
Date: Tue May 6 13:01:34 2014 -0400
Merge branch 'master' into 1970-folder-view
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list