[ARVADOS] updated: cef70f92c560353b8800affba9211382b7920815
git at public.curoverse.com
git at public.curoverse.com
Sun Jul 27 21:48:44 EDT 2014
Summary of changes:
apps/workbench/Gemfile | 1 +
apps/workbench/Gemfile.lock | 2 +
.../app/assets/javascripts/application.js | 26 ++++
apps/workbench/app/assets/javascripts/editable.js | 11 +-
apps/workbench/app/assets/javascripts/tab_panes.js | 38 +++++
.../app/assets/stylesheets/application.css.scss | 5 +
.../app/controllers/application_controller.rb | 3 +
.../controllers/pipeline_instances_controller.rb | 3 +-
.../controllers/pipeline_templates_controller.rb | 3 +-
.../app/controllers/projects_controller.rb | 31 ++++
.../app/helpers/pipeline_components_helper.rb | 13 ++
.../app/helpers/pipeline_instances_helper.rb | 4 +
apps/workbench/app/models/arvados_api_client.rb | 7 +-
.../app/views/application/_choose.html.erb | 8 +-
.../workbench/app/views/application/_choose.js.erb | 1 +
.../views/application/_pipeline_progress.html.erb | 2 +-
.../application/_pipeline_status_label.html.erb | 2 +-
.../views/application/_projects_tree_menu.html.erb | 7 -
.../app/views/layouts/application.html.erb | 167 +--------------------
.../{application.html.erb => body.html.erb} | 68 ++-------
.../pipeline_instances/_show_components.html.erb | 79 +---------
.../_show_components_json.html.erb | 16 ++
....html.erb => _show_components_running.html.erb} | 34 -----
.../views/pipeline_instances/_show_recent.html.erb | 4 +-
.../pipeline_templates/_show_components.html.erb | 4 +-
.../app/views/projects/_show_tab_contents.html.erb | 15 +-
apps/workbench/config/routes.rb | 2 +-
.../pipeline_instances_controller_test.rb | 7 +
.../pipeline_templates_controller_test.rb | 6 +
.../test/integration/pipeline_instances_test.rb | 12 +-
doc/install/index.html.textile.liquid | 2 +-
doc/install/install-keep.html.textile.liquid | 52 +++++++
sdk/cli/bin/crunch-job | 7 +
sdk/python/bin/arv-get | 2 +-
services/api/test/fixtures/pipeline_instances.yml | 22 ++-
services/api/test/fixtures/pipeline_templates.yml | 21 +++
36 files changed, 332 insertions(+), 355 deletions(-)
create mode 100644 apps/workbench/app/helpers/pipeline_components_helper.rb
copy apps/workbench/app/views/layouts/{application.html.erb => body.html.erb} (81%)
create mode 100644 apps/workbench/app/views/pipeline_instances/_show_components_json.html.erb
copy apps/workbench/app/views/pipeline_instances/{_show_components.html.erb => _show_components_running.html.erb} (63%)
create mode 100644 doc/install/install-keep.html.textile.liquid
via cef70f92c560353b8800affba9211382b7920815 (commit)
via ad4fcf639b3a75ddd40aeb659b090c9037d3507e (commit)
via 1a09083539cf6e56fe91a5b5c75c20f35319922b (commit)
via 9afac37490871ab75c9836a2125b19b574bc5acd (commit)
via b653d031a5dbf2a42cf81d787753e945bf3911b4 (commit)
via 4fdfbe8fb9523451b0536042d14c2f229b75c0f3 (commit)
via e1526dc915e10012352fdd260f9267d10fbf3542 (commit)
via 08ab73ebc61834742594b0eb12c7d3fca4660360 (commit)
via 843a9f614c05ad96275badc7125156b6df4bac4c (commit)
via cec86eb60c65a0bc456614e59281ea184485f811 (commit)
via f2d60a7dc6767003ad8b821dc8029a7dd54deaac (commit)
via d0ab992df96443576bc8f30410940c1acdac827a (commit)
via ce8d052472be0cb417596c41f2700cf92a260fd3 (commit)
via 15c61d99c5a867c6a58ef3eb10cc72d7f9ec5cd8 (commit)
via fdc4fd98ee963559ac13e737700a8be1f5c736c7 (commit)
via 7223231e30b3e0e0b488f8db6d7b1749117a05e9 (commit)
via 315312d808d6b8144d7638b108c0a02be3c14f46 (commit)
via fb77c937ac1e0fe4463cfe48c3b60f8a32e8c128 (commit)
via c3d4b399c57e711f0cd87c2178f873a688323967 (commit)
via 8d141d95a821f785f6f0619aebd3cf4a1ccdbca3 (commit)
via 423b74882240aa5fde5ad9bf72c6a89651794882 (commit)
via fad046d56740092b1483cb646d2f7c92c544c165 (commit)
via 99d62839eec24dc65760c33f699b3cae2952f01f (commit)
via 91a3a6759a0294c28fa55f044c2d611d01054c20 (commit)
via a0a03c3668a3cd5956b3bd4677a15d6c86770952 (commit)
via 05e8f8b3b2f18bab495af9b40df54126a41d963f (commit)
via 2369ce76e5c4d7797da2845f0574b56fc7709033 (commit)
via 1bfa822f0bf0b6ff968e229528057da299414457 (commit)
from 27e6fc598e6a86e20b6abb2badde3a3b888a44fa (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 cef70f92c560353b8800affba9211382b7920815
Author: radhika <radhika at curoverse.com>
Date: Sun Jul 27 21:46:44 2014 -0400
2985: move selection items to the chosen project
diff --git a/apps/workbench/app/controllers/projects_controller.rb b/apps/workbench/app/controllers/projects_controller.rb
index f32f356..7857736 100644
--- a/apps/workbench/app/controllers/projects_controller.rb
+++ b/apps/workbench/app/controllers/projects_controller.rb
@@ -52,6 +52,37 @@ class ProjectsController < ApplicationController
end
end
+ def move_items
+ target_uuid = params['target']
+ uuids_to_add = session[:selected_move_items]
+
+ uuids_to_add.
+ collect { |x| ArvadosBase::resource_class_for_uuid(x) }.
+ uniq.
+ each do |resource_class|
+ resource_class.filter([['uuid','in',uuids_to_add]]).each do |dst|
+ if resource_class == Collection
+ dst = Link.new(owner_uuid: target_object.uuid,
+ tail_uuid: target_object.uuid,
+ head_uuid: target_uuid,
+ link_class: 'name',
+ name: target_uuid)
+ else
+ dst.owner_uuid = target_uuid
+ dst.tail_uuid = target_uuid if dst.class == Link
+ end
+ begin
+ dst.save!
+ rescue
+ dst.name += " (#{Time.now.localtime})" if dst.respond_to? :name=
+ dst.save!
+ end
+ end
+ end
+ session[:selected_move_items] = nil
+ redirect_to controller: 'projects', action: :show, id: target_uuid
+ end
+
def destroy
while (objects = Link.filter([['owner_uuid','=', at object.uuid],
['tail_uuid','=', at object.uuid]])).any?
diff --git a/apps/workbench/app/views/application/_choose.js.erb b/apps/workbench/app/views/application/_choose.js.erb
index b033c9b..f1abd34 100644
--- a/apps/workbench/app/views/application/_choose.js.erb
+++ b/apps/workbench/app/views/application/_choose.js.erb
@@ -1,3 +1,4 @@
+<% session[:selected_move_items] = params['move_items'] %>
$('body > .modal-container').html("<%= escape_javascript(render partial: 'choose.html', locals: {multiple: multiple}) %>");
$('body > .modal-container .modal').modal('show');
$('body > .modal-container .modal .modal-footer .btn-primary').
diff --git a/apps/workbench/app/views/projects/_show_tab_contents.html.erb b/apps/workbench/app/views/projects/_show_tab_contents.html.erb
index 0f2ad6f..df37d3e 100644
--- a/apps/workbench/app/views/projects/_show_tab_contents.html.erb
+++ b/apps/workbench/app/views/projects/_show_tab_contents.html.erb
@@ -16,19 +16,18 @@
'data-remote' => true,
'method' => 'delete'
%></li>
- <li><%= link_to "Move selected", '#',
- 'data-href' => choose_projects_path(
+ <li><%= link_to "Move selected", '#',
+ 'data-href' => choose_projects_path(
title: 'Move to...',
editable: true,
action_name: 'Move',
- action_href: url_for(action: :move_selections_into_project,
- controller: 'actions'),
- action_method: 'patch',
- action_data: {selection_param: 'selection[]',
+ action_href: move_items_project_path,
+ action_method: 'get',
+ action_data: {selection_param: 'target',
success: 'page-refresh'}.to_json),
'data-remote' => true,
- 'data-selection-param-name' => 'selection[]',
- 'data-selection-action' => 'move'
+ 'data-selection-param-name' => 'move_items[]',
+ 'data-selection-action' => 'move'
%></li>
</ul>
</div>
diff --git a/apps/workbench/config/routes.rb b/apps/workbench/config/routes.rb
index 15cd178..5655536 100644
--- a/apps/workbench/config/routes.rb
+++ b/apps/workbench/config/routes.rb
@@ -63,10 +63,10 @@ ArvadosWorkbench::Application.routes.draw do
resources :projects do
match 'remove/:item_uuid', on: :member, via: :delete, action: :remove_item
match 'remove_items', on: :member, via: :delete, action: :remove_items
+ get 'move_items', on: :member, action: :move_items
get 'choose', on: :collection
post 'share_with', on: :member
end
- match '/move_selections_into_project' => 'actions#move_selections_into_project', via: :patch
post 'actions' => 'actions#post'
get 'websockets' => 'websocket#index'
commit ad4fcf639b3a75ddd40aeb659b090c9037d3507e
Merge: 27e6fc5 1a09083
Author: radhika <radhika at curoverse.com>
Date: Fri Jul 25 23:07:06 2014 -0400
Merge branch 'master' into 2985-selection-button-move-copy
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list