[ARVADOS] updated: 81bfa2fd57ee5e4b0042d418115f0e50170ee5eb
git at public.curoverse.com
git at public.curoverse.com
Wed Nov 5 22:58:39 EST 2014
Summary of changes:
.../app/assets/javascripts/select_modal.js | 14 +-
apps/workbench/app/helpers/application_helper.rb | 5 +-
.../app/views/application/_choose.html.erb | 7 +-
.../app/views/collections/_choose_rows.html.erb | 6 +-
.../collections/_show_chooser_preview.html.erb | 2 +-
.../app/views/collections/_show_files.html.erb | 5 +-
crunch_scripts/run-command | 248 ++++++++++++----
doc/_config.yml | 1 +
doc/user/topics/arv-run.html.textile.liquid | 166 +++++++++++
doc/user/topics/run-command.html.textile.liquid | 118 ++++++--
sdk/cli/bin/arv | 9 +-
sdk/python/arvados/commands/run.py | 316 +++++++++++++++++++++
sdk/python/arvados/commands/ws.py | 14 +-
sdk/python/arvados/events.py | 12 +-
sdk/python/bin/arv-run | 4 +
.../nodemanager/arvnodeman/computenode/__init__.py | 22 +-
services/nodemanager/arvnodeman/daemon.py | 15 +-
services/nodemanager/tests/test_computenode.py | 30 +-
services/nodemanager/tests/test_daemon.py | 119 +++++---
services/nodemanager/tests/testutil.py | 2 +-
20 files changed, 962 insertions(+), 153 deletions(-)
create mode 100644 doc/user/topics/arv-run.html.textile.liquid
create mode 100644 sdk/python/arvados/commands/run.py
create mode 100755 sdk/python/bin/arv-run
via 81bfa2fd57ee5e4b0042d418115f0e50170ee5eb (commit)
via 6ac59725fedc0a958d60d85740b47deb25addb5b (commit)
via 788ecdf8085f5e69cd3dc960f510b49f11432cb3 (commit)
via 8ad92bb9e7950e0bf758716b40764d26ee33802c (commit)
via 2c693ee50677969a3aa81fe1ba8fd0c702acc20c (commit)
via 294d3c8d367c71be33a818aa463a3490fe54ad5a (commit)
via d5b8652f53bf2ac40cbb7fcd31597d0cd08cac98 (commit)
via 2fe1e71c5cc17dbf06fd7b1e188fd0279c07d3ca (commit)
via 51de3bf2f50cae3fce8a6ffdb3528e96afe67245 (commit)
via 0812bc1c717e5fed57d420b177f6ca9d41e81032 (commit)
via 0edcc26fa0f04c707f0b6fd3694c3dae7572d8f7 (commit)
via a0c099f41a00785b6d28a105e49f40e713e78882 (commit)
via d071c34ca20aa86a5a053abcffb7414dbd8f4933 (commit)
via 6ef24c81cd9d84e5022b776f63328b8ea352c4d1 (commit)
via fa541df794b486efa220bd83bb119e87cca8e2de (commit)
via 04b8def3069732ac8038c39f1541cdc11cf265a0 (commit)
via 66b6518c70a67a94317feaa47e555808bd13b015 (commit)
via f02109541ae4f462c4d1838d78ad06cf318098ce (commit)
via 245c6abec4bf824ad8c8683e59ab6ee08c836cf7 (commit)
via 556fb8540d73e3af07a5bea07e3c831fe477b958 (commit)
via 76ad4467c9b5f223383520f04157b1721a62aa5f (commit)
via 987c225f9f6845868ee674902090c27a5a064f42 (commit)
via b7fe2ea36c87fa648f019c20679b50ab462aec5a (commit)
via 0a37e2d631fd98e2766245c4719586d38bdf10c8 (commit)
via 2ec515c8ef7f9cae426a6490d1317333718e1d5e (commit)
via c79e86aff4cb20413cf0f09c52fe5066ca197deb (commit)
via ca65f360000d14ae987f3f6d3d15244ccf581c72 (commit)
via 60152eec3b8852169bd4121513a25479471d10e5 (commit)
via 7fadfb046ace2dbda699037545c5504e99446046 (commit)
via c0cead2ee16700cf14baba7993297e83787aedbb (commit)
via fee9a5e5f58a830082374e19787a44185a2a0fdb (commit)
via dd131dfc2686e378a7d90f5cc269340ab5adada9 (commit)
via 3f726dd7022da6e2be816ba6cc493212596087f5 (commit)
via c9df4289923a621c929920fe958dbde287f29d73 (commit)
via 0fdfa049801418ecd1faf33ec1415f3b689ea761 (commit)
via 4f4ad25bf60751a09e316dca8c29cf3628ad7bdc (commit)
via c8a5c25611c964d2af8ba26b88622b70692257e4 (commit)
via 1ad626b28816840288093d94a12ea7694201364b (commit)
from 974ad63fc24161cb228003f4ef4cc32d5da578ff (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 81bfa2fd57ee5e4b0042d418115f0e50170ee5eb
Author: radhika <radhika at curoverse.com>
Date: Wed Nov 5 22:57:30 2014 -0500
3177: propagate checkbox selection param when dataclass is File.
diff --git a/apps/workbench/app/assets/javascripts/select_modal.js b/apps/workbench/app/assets/javascripts/select_modal.js
index 596cb70..36c145f 100644
--- a/apps/workbench/app/assets/javascripts/select_modal.js
+++ b/apps/workbench/app/assets/javascripts/select_modal.js
@@ -8,8 +8,11 @@ $(document).on('click', '.selectable', function() {
removeClass('active');
}
$this.toggleClass('active');
- any = ($container.
+
+ if (!$this.hasClass('use-checkbox-selection')) {
+ any = ($container.
find('.selectable.active').length > 0)
+ }
$this.
closest('.modal').
find('[data-enable-if-selection]').
@@ -31,7 +34,14 @@ $(document).on('click', '.selectable', function() {
$(".modal-dialog-preview-pane").html(no_preview_available);
});
}
-
+}).on('click', '.persistent-selection', function() {
+ var $modal = $(this).closest('.modal');
+ $checked_selections = $modal.find('.persistent-selection:checked');
+ any = ($checked_selections.length > 0);
+ $(this).
+ closest('.modal').
+ find('[data-enable-if-selection]').
+ prop('disabled', !any);
}).on('click', '.modal button[data-action-href]', function() {
var selection = [];
var data = [];
diff --git a/apps/workbench/app/helpers/application_helper.rb b/apps/workbench/app/helpers/application_helper.rb
index 165f062..65eb736 100644
--- a/apps/workbench/app/helpers/application_helper.rb
+++ b/apps/workbench/app/helpers/application_helper.rb
@@ -287,6 +287,7 @@ module ApplicationHelper
preconfigured_search_str: (preconfigured_search_str || ""),
action_data: {
merge: true,
+ use_checkbox_selection: dataclass == File ? true : false,
selection_param: selection_param,
success: 'page-refresh'
}.to_json,
@@ -448,10 +449,10 @@ module ApplicationHelper
end
end
- def chooser_preview_url_for object
+ def chooser_preview_url_for object, use_checkbox_selection=false
case object.class.to_s
when 'Collection'
- polymorphic_path(object, tab_pane: 'chooser_preview')
+ polymorphic_path(object, tab_pane: 'chooser_preview', use_checkbox_selection: use_checkbox_selection)
else
nil
end
diff --git a/apps/workbench/app/views/application/_choose.html.erb b/apps/workbench/app/views/application/_choose.html.erb
index fc16139..26bf407 100644
--- a/apps/workbench/app/views/application/_choose.html.erb
+++ b/apps/workbench/app/views/application/_choose.html.erb
@@ -61,7 +61,12 @@
<% if project_filters.any? %>
data-infinite-content-params-from-project-dropdown="<%= {filters: project_filters, project_uuid: project_filters.last.last}.to_json %>"
<% end %>
- data-infinite-content-href="<%= url_for partial: true %>">
+ <%
+ action_data = JSON.parse params['action_data'] if params['action_data']
+ use_checkbox_sel = action_data ? action_data['use_checkbox_selection'] : false
+ %>
+ data-infinite-content-href="<%= url_for partial: true,
+ use_checkbox_selection: use_checkbox_sel %>">
</div>
<% if preview_pane %>
<div class="col-md-6 hidden-xs hidden-sm modal-dialog-preview-pane" style="height: 100%; overflow-y: scroll">
diff --git a/apps/workbench/app/views/collections/_choose_rows.html.erb b/apps/workbench/app/views/collections/_choose_rows.html.erb
index da0f975..f782bb8 100644
--- a/apps/workbench/app/views/collections/_choose_rows.html.erb
+++ b/apps/workbench/app/views/collections/_choose_rows.html.erb
@@ -1,6 +1,6 @@
<% @collections.each do |object| %>
- <div class="row filterable selectable" data-object-uuid="<%= object.uuid %>"
- data-preview-href="<%= chooser_preview_url_for object %>"
+ <div class="row filterable selectable <%= 'use-checkbox-selection' if params['use_checkbox_selection']%>" data-object-uuid="<%= object.uuid %>"
+ data-preview-href="<%= chooser_preview_url_for object, params['use_checkbox_selection'] %>"
style="margin-left: 1em; border-bottom-style: solid; border-bottom-width: 1px; border-bottom-color: #DDDDDD">
<i class="fa fa-fw fa-archive"></i>
<% if object.respond_to? :name %>
@@ -26,7 +26,7 @@
<% @name_links.each do |name_link| %>
<% if (object = get_object(name_link.head_uuid)) %>
<div class="row filterable selectable" data-object-uuid="<%= name_link.uuid %>"
- data-preview-href="<%= chooser_preview_url_for object %>"
+ data-preview-href="<%= chooser_preview_url_for object%>"
style="margin-left: 1em; border-bottom-style: solid; border-bottom-width: 1px; border-bottom-color: #DDDDDD">
<i class="fa fa-fw fa-archive"></i>
<%= name_link.name %>
diff --git a/apps/workbench/app/views/collections/_show_chooser_preview.html.erb b/apps/workbench/app/views/collections/_show_chooser_preview.html.erb
index 4a0a837..eae99fa 100644
--- a/apps/workbench/app/views/collections/_show_chooser_preview.html.erb
+++ b/apps/workbench/app/views/collections/_show_chooser_preview.html.erb
@@ -1,2 +1,2 @@
<%= render partial: "show_source_summary" %>
-<%= render partial: "show_files", locals: {no_checkboxes: true} %>
+<%= render partial: "show_files", locals: {no_checkboxes: true, use_checkbox_selection: params['use_checkbox_selection']} %>
diff --git a/apps/workbench/app/views/collections/_show_files.html.erb b/apps/workbench/app/views/collections/_show_files.html.erb
index adbf480..a9a3dea 100644
--- a/apps/workbench/app/views/collections/_show_files.html.erb
+++ b/apps/workbench/app/views/collections/_show_files.html.erb
@@ -86,7 +86,8 @@
</div>
<div class="collection_files_name">
- <%# if !defined? no_checkboxes or !no_checkboxes %>
+ <% if !defined? no_checkboxes or !no_checkboxes or
+ (!params['use_checkbox_selection'].nil? and params['use_checkbox_selection'] == 'true') %>
<%= check_box_tag 'uuids[]', "#{@object.uuid}/#{file_path}", false, {
:class => 'persistent-selection',
:friendly_type => "File",
@@ -96,7 +97,7 @@
:title => "Include #{file_path} in your selections",
} %>
<span> </span>
- <%# end %>
+ <% end %>
<% if CollectionsHelper::is_image(filename) %>
<i class="fa fa-fw fa-bar-chart-o"></i> <%= filename %></div>
</div>
commit 6ac59725fedc0a958d60d85740b47deb25addb5b
Merge: 974ad63 788ecdf
Author: radhika <radhika at curoverse.com>
Date: Wed Nov 5 15:46:10 2014 -0500
Merge branch 'master' into 3177-collection-choose-files
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list