[ARVADOS] updated: 572400db0f322f365e2bf6849ceebc432a69191a

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/views/application/_choose.html.erb    | 2 +-
 apps/workbench/app/views/projects/_show_sharing.html.erb | 1 +
 apps/workbench/test/integration/projects_test.rb         | 6 ++++++
 3 files changed, 8 insertions(+), 1 deletion(-)

       via  572400db0f322f365e2bf6849ceebc432a69191a (commit)
      from  b82d80addf80b9ead7c63f85f72613042b3b2c51 (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 572400db0f322f365e2bf6849ceebc432a69191a
Author: Brett Smith <brett at curoverse.com>
Date:   Thu Aug 7 08:44:21 2014 -0400

    3436: Don't show Projects pulldown on project sharing popups.
    
    Closes #3436.

diff --git a/apps/workbench/app/views/application/_choose.html.erb b/apps/workbench/app/views/application/_choose.html.erb
index 0d3f71b..37382df 100644
--- a/apps/workbench/app/views/application/_choose.html.erb
+++ b/apps/workbench/app/views/application/_choose.html.erb
@@ -8,7 +8,7 @@
 
       <div class="modal-body">
         <div class="input-group">
-          <% if params[:by_project] != false %>
+          <% if params[:by_project].to_s != "false" %>
             <div class="input-group-btn" data-filterable-target=".modal.arv-choose .selectable-container">
               <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
                 All projects <span class="caret"></span>
diff --git a/apps/workbench/app/views/projects/_show_sharing.html.erb b/apps/workbench/app/views/projects/_show_sharing.html.erb
index 89a7950..ad23065 100644
--- a/apps/workbench/app/views/projects/_show_sharing.html.erb
+++ b/apps/workbench/app/views/projects/_show_sharing.html.erb
@@ -31,6 +31,7 @@
 
   <%= link_to(send("choose_#{share_class}_path",
       title: "Share with #{share_class}",
+      by_project: false,
       preview_pane: false,
       multiple: true,
       limit: 10000,
diff --git a/apps/workbench/test/integration/projects_test.rb b/apps/workbench/test/integration/projects_test.rb
index d8b4cb1..9b5e65d 100644
--- a/apps/workbench/test/integration/projects_test.rb
+++ b/apps/workbench/test/integration/projects_test.rb
@@ -97,6 +97,12 @@ class ProjectsTest < ActionDispatch::IntegrationTest
     assert(page.has_no_text?(name), "project is already shared with #{name}")
     start_share_count = share_rows.size
     click_on("Share with #{share_type}")
+    within("div.modal-container") do
+      assert_raises(Capybara::ElementNotFound,
+                    "Projects pulldown available from sharing dialog") do
+        click_on "All projects"
+      end
+    end
     find(".selectable", text: name).click
     find(".modal-footer a,button", text: "Add").click
     using_wait_time(Capybara.default_wait_time * 3) do

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


hooks/post-receive
--