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 fc29ec26594ec7bf440e5f812e7fec54088a88a8..62c0b32e1edab98ec13c52932ae91f6ec0bb1fb2 100644 (file)
--- 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 cf46965dc4df8ce6128638342db1a2cdfd4a3617..c830e857848d81060b65eb8b9d9bd5aca91213be 100644 (file)
--- 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 1b0834d3f00b7691098eed3b4cdaec0883903e53..7272b510491b59b8a98d84951ab72f69aebc48fd 100644 (file)
--- 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 986a2022615eb7ed3cc94797132c3a74e1bad6f3..3235783b875690e942f0db3b2bb629a0d351c365 100644 (file)
--- 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 27b9269032de6af5a5f1317e0db590d1e0c51fea..34b77d841c87897363998dca78a1ab2ee02d0337 100644 (file)
--- 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