[ARVADOS] updated: 7e3496abb1b8c70607df37b6f096c8acd42d714d

git at public.curoverse.com git at public.curoverse.com
Mon Sep 8 10:56:59 EDT 2014


Summary of changes:
 .../app/controllers/actions_controller.rb          |  8 ++----
 .../app/views/collections/_show_files.html.erb     |  1 -
 .../app/views/collections/_show_recent.html.erb    |  1 -
 .../app/views/projects/_show_tab_contents.html.erb |  1 -
 apps/workbench/app/views/projects/show.html.erb    |  2 +-
 .../workbench/test/integration/collections_test.rb | 29 ++++++++++++----------
 .../controllers/arvados/v1/schema_controller.rb    |  8 +++++-
 7 files changed, 26 insertions(+), 24 deletions(-)

       via  7e3496abb1b8c70607df37b6f096c8acd42d714d (commit)
       via  2b96f0945cfdbda223227b96393a5f77aff477a4 (commit)
       via  d43fb929ea2fdf984a86bc00c257e989e4b7a88c (commit)
      from  43d6c4e398e53a43f5b52c556128a33c8f84f5a3 (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 7e3496abb1b8c70607df37b6f096c8acd42d714d
Merge: 2b96f09 d43fb92
Author: radhika <radhika at curoverse.com>
Date:   Mon Sep 8 10:56:51 2014 -0400

    Merge branch 'master' into 3654-combine-selections


commit 2b96f0945cfdbda223227b96393a5f77aff477a4
Author: radhika <radhika at curoverse.com>
Date:   Mon Sep 8 10:56:12 2014 -0400

    3654: redirection to newly created collection is now working.

diff --git a/apps/workbench/app/controllers/actions_controller.rb b/apps/workbench/app/controllers/actions_controller.rb
index fc29ec2..62c0b32 100644
--- a/apps/workbench/app/controllers/actions_controller.rb
+++ b/apps/workbench/app/controllers/actions_controller.rb
@@ -172,13 +172,9 @@ class ActionsController < ApplicationController
 
     action_data = JSON.parse(params['action_data']) if params['action_data']
     if action_data && action_data['selection_param'].eql?('project')
-      respond_to do |format|
-        format.js {render inline: "location.reload();" }
-      end
+      redirect_to :back
     else
-      respond_to do |format|
-        format.js {redirect_to url_for(controller: 'collections', action: :show, id: newc.uuid)}
-      end
+      redirect_to url_for(controller: 'collections', action: :show, id: newc.uuid)
     end
   end
 
diff --git a/apps/workbench/app/views/collections/_show_files.html.erb b/apps/workbench/app/views/collections/_show_files.html.erb
index cf46965..c830e85 100644
--- a/apps/workbench/app/views/collections/_show_files.html.erb
+++ b/apps/workbench/app/views/collections/_show_files.html.erb
@@ -8,7 +8,6 @@
                   'data-href' => combine_selected_path,
                   'data-selection-param-name' => 'selection[]',
                   'data-selection-action' => 'combine-collections',
-                  'data-remote' => true,
                   'method' => 'post',
                   'data-toggle' => 'dropdown'
             %></li>
diff --git a/apps/workbench/app/views/collections/_show_recent.html.erb b/apps/workbench/app/views/collections/_show_recent.html.erb
index 1b0834d..7272b51 100644
--- a/apps/workbench/app/views/collections/_show_recent.html.erb
+++ b/apps/workbench/app/views/collections/_show_recent.html.erb
@@ -8,7 +8,6 @@
                   'data-href' => combine_selected_path,
                   'data-selection-param-name' => 'selection[]',
                   'data-selection-action' => 'combine-collections',
-                  'data-remote' => true,
                   'method' => 'post',
                   'data-toggle' => 'dropdown'
             %></li>
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 986a202..3235783 100644
--- a/apps/workbench/app/views/projects/_show_tab_contents.html.erb
+++ b/apps/workbench/app/views/projects/_show_tab_contents.html.erb
@@ -10,7 +10,6 @@
                   ),
                   'data-selection-param-name' => 'selection[]',
                   'data-selection-action' => 'combine-project-contents',
-                  'data-remote' => true,
                   'method' => 'post',
                   'data-toggle' => 'dropdown'
             %></li>
diff --git a/apps/workbench/test/integration/collections_test.rb b/apps/workbench/test/integration/collections_test.rb
index 27b9269..34b77d8 100644
--- a/apps/workbench/test/integration/collections_test.rb
+++ b/apps/workbench/test/integration/collections_test.rb
@@ -52,19 +52,19 @@ class CollectionsTest < ActionDispatch::IntegrationTest
   end
 
   test "combine selected collections into new collection" do
-    foo_collection_uuid = api_fixture('collections')['foo_file']['uuid']
-    bar_collection_uuid = api_fixture('collections')['bar_file']['uuid']
+    foo_collection = api_fixture('collections')['foo_file']
+    bar_collection = api_fixture('collections')['bar_file']
 
     visit page_with_token('active', "/collections")
 
-    assert(page.has_text?(foo_collection_uuid), "Collection page did not include foo file")
-    assert(page.has_text?(bar_collection_uuid), "Collection page did not include bar file")
+    assert(page.has_text?(foo_collection['uuid']), "Collection page did not include foo file")
+    assert(page.has_text?(bar_collection['uuid']), "Collection page did not include bar file")
 
-    within('tr', text: foo_collection_uuid) do
+    within('tr', text: foo_collection['uuid']) do
       find('input[type=checkbox]').click
     end
 
-    within('tr', text: bar_collection_uuid) do
+    within('tr', text: bar_collection['uuid']) do
       find('input[type=checkbox]').click
     end
 
@@ -73,15 +73,16 @@ class CollectionsTest < ActionDispatch::IntegrationTest
       click_link 'Combine selections into a new collection'
     end
 
-    # back in collections page
-    assert(page.has_text?(foo_collection_uuid), "Collection page did not include foo file")
-    assert(page.has_text?(bar_collection_uuid), "Collection page did not include bar file")
+    # now in the newly created collection page
+    assert(page.has_text?('Copy to project'), "Copy to project text not found in new collection page")
+    assert(page.has_no_text?(foo_collection['name']), "Collection page did not include foo file")
+    assert(page.has_text?('foo'), "Collection page did not include foo file")
+    assert(page.has_no_text?(bar_collection['name']), "Collection page did not include foo file")
+    assert(page.has_text?('bar'), "Collection page did not include bar file")
   end
 
   test "combine selected collection contents into new collection" do
     foo_collection = api_fixture('collections')['foo_file']
-   # bar_collection = api_fixture('collections')['bar_file']
-   # pdh_collection = api_fixture('collections')['multilevel_collection_1']
 
     visit page_with_token('active', "/collections")
 
@@ -98,7 +99,9 @@ class CollectionsTest < ActionDispatch::IntegrationTest
       click_link 'Combine selections into a new collection'
     end
 
-    # go back to collections page
-    visit page_with_token('active', "/collections")
+    # now in the newly created collection page
+    assert(page.has_text?('Copy to project'), "Copy to project text not found in new collection page")
+    assert(page.has_no_text?(foo_collection['name']), "Collection page did not include foo file")
+    assert(page.has_text?('foo'), "Collection page did not include foo file")
   end
 end

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list