[ARVADOS] updated: e5152a25b9f9803522c15ff6397545f68d1d07a2
git at public.curoverse.com
git at public.curoverse.com
Fri Sep 12 14:23:45 EDT 2014
Summary of changes:
apps/workbench/app/views/collections/_show_files.html.erb | 9 ++++-----
.../workbench/app/views/collections/_show_recent.html.erb | 2 +-
.../app/views/projects/_show_tab_contents.html.erb | 2 +-
apps/workbench/test/integration/collections_test.rb | 6 +++---
apps/workbench/test/integration/projects_test.rb | 12 ++++++------
sdk/cli/bin/arv-run-pipeline-instance | 11 ++++++++++-
sdk/cli/bin/crunch-job | 6 ++++++
services/api/app/models/job_task.rb | 2 ++
services/api/app/models/pipeline_instance.rb | 2 ++
...183946_add_start_finish_time_to_tasks_and_pipelines.rb | 15 +++++++++++++++
services/api/db/structure.sql | 10 ++++++++--
11 files changed, 58 insertions(+), 19 deletions(-)
create mode 100644 services/api/db/migrate/20140909183946_add_start_finish_time_to_tasks_and_pipelines.rb
via e5152a25b9f9803522c15ff6397545f68d1d07a2 (commit)
via 132db914689be8338c16ea3d6748d073af2a6240 (commit)
via ac594f16176901b7692be354045226e093b14218 (commit)
via 00a0690c32f29f7d2c1b6030dd01578d98ea6dd6 (commit)
via 35bf7a16482b304908c5b6bf3cd772647158f593 (commit)
via e7973cab8f9fc9531e4d928e73928e6eab022f48 (commit)
via 655d5ae89e941c8b11bd4ba795e9ef2168463881 (commit)
via e5ab4ce19d5ace5e6dd5cd32c23f50b35d20c8ef (commit)
from 2109516cd314190311d837fcf40576c87dd38cd1 (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 e5152a25b9f9803522c15ff6397545f68d1d07a2
Author: radhika <radhika at curoverse.com>
Date: Fri Sep 12 14:19:44 2014 -0400
3654: disable search icon collection show page rather than hide it when it is not applicable.
diff --git a/apps/workbench/app/views/collections/_show_files.html.erb b/apps/workbench/app/views/collections/_show_files.html.erb
index 020f16d..9fdd32b 100644
--- a/apps/workbench/app/views/collections/_show_files.html.erb
+++ b/apps/workbench/app/views/collections/_show_files.html.erb
@@ -5,7 +5,7 @@
<div class="btn-group btn-group-sm">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">Selection... <span class="caret"></span></button>
<ul class="dropdown-menu" role="menu">
- <li><%= link_to "Combine selected files into a new collection", '#',
+ <li><%= link_to "Create new collection with selected files", '#',
'data-href' => combine_selected_path,
'data-selection-param-name' => 'selection[]',
'data-selection-action' => 'combine-collections',
@@ -43,12 +43,10 @@
<div class="collection_files_row">
<div class="collection_files_buttons pull-right">
<%= raw(human_readable_bytes_html(size)) %>
- <% if Rails.configuration.filename_suffixes_with_view_icon.include? file_path.split('.')[-1] %>
+ <% disable_search = (Rails.configuration.filename_suffixes_with_view_icon.include? file_path.split('.')[-1]) ? false : true %>
<%= link_to(raw('<i class="fa fa-search"></i>'),
link_params.merge(disposition: 'inline'),
- {title: "View #{file_path}", class: "btn btn-info btn-sm"}) %>
- <% end %>
-
+ {title: "View #{file_path}", class: "btn btn-info btn-sm", disabled: disable_search}) %>
<%= link_to(raw('<i class="fa fa-download"></i>'),
link_params.merge(disposition: 'attachment'),
{title: "Download #{file_path}", class: "btn btn-info btn-sm"}) %>
@@ -64,6 +62,7 @@
uuid: @object.portable_data_hash, file: file_path),
:title => "Include #{file_path} in your selections",
} %>
+ <span> </span>
<% end %>
<% if CollectionsHelper::is_image(filename) %>
<i class="fa fa-fw fa-bar-chart-o"></i> <%= filename %></div>
diff --git a/apps/workbench/app/views/collections/_show_recent.html.erb b/apps/workbench/app/views/collections/_show_recent.html.erb
index 5edabfa..c958b29 100644
--- a/apps/workbench/app/views/collections/_show_recent.html.erb
+++ b/apps/workbench/app/views/collections/_show_recent.html.erb
@@ -4,7 +4,7 @@
<div class="btn-group btn-group-sm">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">Selection... <span class="caret"></span></button>
<ul class="dropdown-menu" role="menu">
- <li><%= link_to "Combine selected collections into a new collection", '#',
+ <li><%= link_to "Create new collection with selected collections", '#',
'data-href' => combine_selected_path,
'data-selection-param-name' => 'selection[]',
'data-selection-action' => 'combine-collections',
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 3aff23e..f185abe 100644
--- a/apps/workbench/app/views/projects/_show_tab_contents.html.erb
+++ b/apps/workbench/app/views/projects/_show_tab_contents.html.erb
@@ -4,7 +4,7 @@
<div class="btn-group btn-group-sm">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">Selection... <span class="caret"></span></button>
<ul class="dropdown-menu" role="menu">
- <li><%= link_to "Combine selected collections into a new collection", '#',
+ <li><%= link_to "Create new collection with selected collections", '#',
'data-href' => combine_selected_path(
action_data: {selection_param: 'project'}.to_json
),
diff --git a/apps/workbench/test/integration/collections_test.rb b/apps/workbench/test/integration/collections_test.rb
index 084a338..17a59f8 100644
--- a/apps/workbench/test/integration/collections_test.rb
+++ b/apps/workbench/test/integration/collections_test.rb
@@ -70,7 +70,7 @@ class CollectionsTest < ActionDispatch::IntegrationTest
click_button 'Selection...'
within('.selection-action-container') do
- click_link 'Combine selected collections into a new collection'
+ click_link 'Create new collection with selected collections'
end
# now in the newly created collection page
@@ -81,7 +81,7 @@ class CollectionsTest < ActionDispatch::IntegrationTest
assert(page.has_text?('bar'), "Collection page did not include bar file")
end
- test "combine selected collection contents into new collection" do
+ test "combine selected collection files into new collection" do
foo_collection = api_fixture('collections')['foo_file']
visit page_with_token('active', "/collections")
@@ -96,7 +96,7 @@ class CollectionsTest < ActionDispatch::IntegrationTest
click_button 'Selection...'
within('.selection-action-container') do
- click_link 'Combine selected files into a new collection'
+ click_link 'Create new collection with selected files'
end
# now in the newly created collection page
diff --git a/apps/workbench/test/integration/projects_test.rb b/apps/workbench/test/integration/projects_test.rb
index ade4ed4..3b7f7a4 100644
--- a/apps/workbench/test/integration/projects_test.rb
+++ b/apps/workbench/test/integration/projects_test.rb
@@ -339,7 +339,7 @@ class ProjectsTest < ActionDispatch::IntegrationTest
click_button 'Selection...'
within('.selection-action-container') do
- page.assert_selector 'li.disabled', text: 'Combine selected collections into a new collection'
+ page.assert_selector 'li.disabled', text: 'Create new collection with selected collections'
page.assert_selector 'li.disabled', text: 'Compare selected'
page.assert_selector 'li.disabled', text: 'Copy selected'
page.assert_selector 'li.disabled', text: 'Move selected'
@@ -357,8 +357,8 @@ class ProjectsTest < ActionDispatch::IntegrationTest
click_button 'Selection...'
within('.selection-action-container') do
- page.assert_no_selector 'li.disabled', text: 'Combine selected collections into a new collection'
- page.assert_selector 'li', text: 'Combine selected collections into a new collection'
+ page.assert_no_selector 'li.disabled', text: 'Create new collection with selected collections'
+ page.assert_selector 'li', text: 'Create new collection with selected collections'
page.assert_selector 'li.disabled', text: 'Compare selected'
page.assert_no_selector 'li.disabled', text: 'Copy selected'
page.assert_selector 'li', text: 'Copy selected'
@@ -381,7 +381,7 @@ class ProjectsTest < ActionDispatch::IntegrationTest
click_button 'Selection...'
within('.selection-action-container') do
- page.assert_selector 'li.disabled', text: 'Combine selected collections into a new collection'
+ page.assert_selector 'li.disabled', text: 'Create new collection with selected collections'
page.assert_selector 'li.disabled', text: 'Compare selected'
page.assert_selector 'li.disabled', text: 'Copy selected'
page.assert_no_selector 'li.disabled', text: 'Move selected'
@@ -410,7 +410,7 @@ class ProjectsTest < ActionDispatch::IntegrationTest
click_button 'Selection...'
within('.selection-action-container') do
- page.assert_selector 'li.disabled', text: 'Combine selected collections into a new collection'
+ page.assert_selector 'li.disabled', text: 'Create new collection with selected collections'
page.assert_selector 'li.disabled', text: 'Compare selected'
page.assert_selector 'li.disabled', text: 'Copy selected'
page.assert_no_selector 'li.disabled', text: 'Move selected'
@@ -434,7 +434,7 @@ class ProjectsTest < ActionDispatch::IntegrationTest
click_button 'Selection...'
within('.selection-action-container') do
- click_link 'Combine selected collections into a new collection'
+ click_link 'Create new collection with selected collections'
end
# back in project page
commit 132db914689be8338c16ea3d6748d073af2a6240
Merge: 2109516 ac594f1
Author: radhika <radhika at curoverse.com>
Date: Fri Sep 12 13:26:37 2014 -0400
Merge branch 'master' into 3654-combine-selections
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list