[ARVADOS] updated: 4eae62369588616d8833010c5febc939a4820cf0
git at public.curoverse.com
git at public.curoverse.com
Mon Aug 11 16:10:52 EDT 2014
Summary of changes:
.../app/controllers/actions_controller.rb | 1 +
.../app/controllers/application_controller.rb | 13 ++--
.../app/controllers/collections_controller.rb | 1 +
.../workbench/app/controllers/groups_controller.rb | 4 +-
.../app/controllers/projects_controller.rb | 41 +++++++++--
.../workbench/app/controllers/search_controller.rb | 7 +-
apps/workbench/app/helpers/application_helper.rb | 7 +-
apps/workbench/app/models/group.rb | 2 +-
apps/workbench/app/models/pipeline_instance.rb | 9 ++-
apps/workbench/app/models/user.rb | 6 +-
.../app/views/application/_choose.html.erb | 12 ++--
.../app/views/application/_content.html.erb | 21 ------
.../app/views/application/_content_layout.html.erb | 2 +-
.../views/application/_projects_tree_menu.html.erb | 9 +--
.../app/views/collections/_choose_rows.html.erb | 12 ++--
apps/workbench/app/views/collections/show.html.erb | 39 +++++-----
apps/workbench/app/views/layouts/body.html.erb | 21 ++++--
.../views/pipeline_instances/_show_inputs.html.erb | 3 +-
.../app/views/projects/_index_projects.html.erb | 8 ++-
.../views/projects/_show_data_collections.html.erb | 32 +++++----
.../app/views/projects/_show_sharing.html.erb | 6 ++
apps/workbench/app/views/projects/index.html.erb | 7 +-
.../app/views/users/_choose_rows.html.erb | 2 +-
.../test/integration/pipeline_instances_test.rb | 3 +
apps/workbench/test/integration/projects_test.rb | 28 +++++++-
doc/api/schema/Group.html.textile.liquid | 2 +-
.../schema/PipelineTemplate.html.textile.liquid | 6 +-
sdk/cli/bin/arv-run-pipeline-instance | 33 ++++++---
sdk/cli/bin/crunch-job | 47 ++++++-------
sdk/python/arvados/api.py | 82 +++++++++++++++-------
sdk/python/arvados/commands/put.py | 39 +++++-----
sdk/python/arvados/errors.py | 11 +++
sdk/python/tests/test_api.py | 76 ++++++++++++++++++++
sdk/python/tests/test_arv_put.py | 81 ++++++++++++---------
sdk/python/tests/test_keep_client.py | 45 ++++++------
.../arvados/v1/collections_controller.rb | 6 +-
.../controllers/arvados/v1/groups_controller.rb | 19 +++--
.../arvados/v1/repositories_controller.rb | 7 +-
services/api/app/models/collection.rb | 64 +++++++++--------
services/api/app/models/link.rb | 2 +-
services/api/app/models/locator.rb | 11 ++-
services/api/app/models/user.rb | 6 +-
services/api/config/application.default.yml | 2 +-
services/api/db/structure.sql | 1 +
services/api/test/fixtures/authorized_keys.yml | 16 +++++
services/api/test/fixtures/collections.yml | 12 ++++
services/api/test/fixtures/links.yml | 32 ++++++++-
.../arvados/v1/groups_controller_test.rb | 22 +++++-
.../arvados/v1/repositories_controller_test.rb | 32 +++++++++
.../functional/arvados/v1/users_controller_test.rb | 22 +++---
services/api/test/unit/job_test.rb | 7 ++
services/api/test/unit/user_test.rb | 8 +--
services/keep/src/keep/handler_test.go | 9 +++
services/keep/src/keep/handlers.go | 5 ++
services/keep/src/keep/keep.go | 31 +++++---
55 files changed, 710 insertions(+), 322 deletions(-)
create mode 100644 sdk/python/tests/test_api.py
via 4eae62369588616d8833010c5febc939a4820cf0 (commit)
via ac30c34ccfacce16cca52e155d2a0e50b0185dc3 (commit)
via cedd2b046ddf4d2f819a4d1dedbbe82d4e70e72d (commit)
via 612d5fd9a0066665b522997f025499460d9edf43 (commit)
via 381926c94a3b41d04101f68ec6a33e88fc795254 (commit)
via 6d0b4ad4696fa11a3e940cb731f134a61fc26729 (commit)
via c6210b84588721c1e337c7dd9a0e25edb14301bb (commit)
via 34f675d7e46d8446a11488d9970e589f988456bd (commit)
via af2a757d9be739543a912547eaefcadc851109e1 (commit)
via eef298a7cf58771583b255fb0e3e1cfcbcdb6e48 (commit)
via 2945ea907a7c35da2d03d6775574fb1ad9be2b09 (commit)
via e932523a818a5d305ae541379b531a381f06edf4 (commit)
via d36a4308d2e3dd564ddee92347466833c57ccfc9 (commit)
via 0850fa67a98dd28536312b1c4388b43eceba7b89 (commit)
via da85b5f1617656e03535dc490f027d7fae4d702e (commit)
via 0cae143d67d3b45f2a945bd11d34da082a17b44c (commit)
via bda338bf2fd3bac648fad00e4646ff574510956f (commit)
via 1076b57c3d701df3ceaa4d54973ccc533729f097 (commit)
via 2d96a5bd256fc82dc274333ddaa4395016037170 (commit)
via b75aa879bc2035b5ac07ec3c389b4898194a03d7 (commit)
via 299396a4e79e5e5f6e5519898f563cd19bac6431 (commit)
via b2800c21fc219f26066d531b2082dac0d377e7f4 (commit)
via a69da9e1aaa4e80209d21fba82e79d02b90222c0 (commit)
via 4e5e843708a52e8587344be28269e14d7ad41409 (commit)
via 21be87a976a7234e1a69e7f2a61c43c80e90b804 (commit)
via 61e0cea2c42441dcdedd3776ca4520c8079eaa4b (commit)
via a15f61aef5f26dc6d0bb3e6ab02428b1d2a87ae8 (commit)
via 5bbd6abc7a32c6912db5f36f0af5a923ac4b7c79 (commit)
via b1ea8228cf8b891a94deb09a619294315a0f1901 (commit)
via 3c92c12e51c985e894851f90205aa02bb3895cdf (commit)
via 7f15a960d533ae692112d90e79bfa1a69f4dd27f (commit)
via 1d1069684c35353f9f0ee4020b76f5dfc7406a47 (commit)
via 1865158987c87ef6e6b1c53db65615b17b6324af (commit)
via 862a1fd23f072b7107595755996fc2ec1c62162b (commit)
via 572400db0f322f365e2bf6849ceebc432a69191a (commit)
via 8e76d0a54757172747f93eaa797e6d1746f8cd32 (commit)
via 780560ca57ad92e01edd23301750b8c1623d41db (commit)
via b20cc78fe133ad073edaa1f07effa90297015e99 (commit)
via e940b6f9ddaaabb5c21f1d0b10754231e74df67f (commit)
via 5f24e9f419222574f16640448be2de731de584b8 (commit)
via b82d80addf80b9ead7c63f85f72613042b3b2c51 (commit)
via 7962de491af28d00a9c88412ad4d1e42be83432a (commit)
via c29fc69a571bc2e4a4e450a09d94adbb305633bd (commit)
via 3af6ef2d42e3e6efb3ea8e1f32d34293f9b1011e (commit)
via fca9bd08944a78cf0b6843e06598a5378cb31581 (commit)
via fc68033c06f6f4320a9f901d3e79cc57d8097a21 (commit)
via 5ce1225be2b74fa8b2025b0f52e72b86629fecc1 (commit)
via 2bf927358c5956c5296009948c45403c54787021 (commit)
via 4eafb2b779b5048c5b5ecb04711c853a974e5796 (commit)
via f9d2cd963c314188c0351253c00d6dc82f276ed7 (commit)
via 46f565cf2dd89a3ec6ad78b1237b3a4b0db6404b (commit)
via 9ea365275a363d634908f2a1eb5926024e8e8803 (commit)
via 7ab94b8875b1ada5021e5b494b3f38f7eab5328c (commit)
via 22b165b48c33239aefee631ffbb00079c5486866 (commit)
from 36c360770c7925509552cfe8c3d8bf64fe1c2644 (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 4eae62369588616d8833010c5febc939a4820cf0
Author: Phil Hodgson <bitbucket at philhodgson.net>
Date: Mon Aug 11 16:10:35 2014 -0400
Make Collection page's Copy into project use the standard chooser (refs #3114, refs #3476)
Also bug fix: now creates a copy of the link rather than the collection.
Also moved to the tab_line_buttons panel.
diff --git a/apps/workbench/app/controllers/actions_controller.rb b/apps/workbench/app/controllers/actions_controller.rb
index d1dc0fc..265cff4 100644
--- a/apps/workbench/app/controllers/actions_controller.rb
+++ b/apps/workbench/app/controllers/actions_controller.rb
@@ -42,6 +42,7 @@ class ActionsController < ApplicationController
def move_or_copy action
uuids_to_add = params["selection"]
+ uuids_to_add = [ uuids_to_add ] unless uuids_to_add.is_a? Array
uuids_to_add.
collect { |x| ArvadosBase::resource_class_for_uuid(x) }.
uniq.
diff --git a/apps/workbench/app/views/collections/show.html.erb b/apps/workbench/app/views/collections/show.html.erb
index f049de9..4585a43 100644
--- a/apps/workbench/app/views/collections/show.html.erb
+++ b/apps/workbench/app/views/collections/show.html.erb
@@ -1,24 +1,21 @@
-<div class="dropdown">
- <button class="btn btn-default dropdown-toggle" id="copy2project-btn" type="button" data-toggle="dropdown">
- Copy this collection to project...
- <span class="caret"></span>
- </button>
- <ul class="dropdown-menu" role="menu" aria-labelledby="copy2project-btn">
- <%= render partial: "projects_tree_menu", locals: {
- :project_link_to => Proc.new do |pnode, &block|
- link_to( actions_path(id: pnode[:object].uuid,
- selection: [ @object.uuid ],
- selection_param: 'selection[]',
- copy_selections_into_project: pnode[:object].uuid,
- success: 'redirect-to-created-object'),
- method: :post,
- &block)
- end,
- :top_button => nil
- } %>
- </ul>
-</div>
-
+<% content_for :tab_line_buttons do %>
+ <%= link_to(
+ choose_projects_path(
+ title: 'Copy to project...',
+ my_root_selectable: true,
+ action_name: 'Copy',
+ action_href: actions_path,
+ action_method: 'post',
+ action_data: {
+ copy_selections_into_project: true,
+ selection: @name_link.andand.uuid || @object.uuid,
+ selection_param: 'uuid',
+ success: 'redirect-to-created-object'
+ }.to_json),
+ { class: "btn btn-sm btn-primary arv-move-to-project", remote: true, method: 'get' }) do %>
+ <i class="fa fa-fw fa-copy"></i> Copy to project...
+ <% end %>
+<% end %>
<div class="row row-fill-height">
<div class="col-md-6">
commit ac30c34ccfacce16cca52e155d2a0e50b0185dc3
Merge: 36c3607 cedd2b0
Author: Phil Hodgson <bitbucket at philhodgson.net>
Date: Mon Aug 11 12:28:24 2014 -0400
Merge branch 'master' into 3114-copy-to-project
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list