From dd198047ab128658010869830b27ef6b83f5182e Mon Sep 17 00:00:00 2001
From: Tom Clegg <tom@curoverse.com>
Date: Mon, 21 Jul 2014 14:17:34 -0400
Subject: [PATCH] 3235: Fix project dropdown, use it when choosing collections.

---
 .../app/controllers/collections_controller.rb |  3 +
 .../app/views/application/_choose.html.erb    | 63 +++++++++----------
 .../application/_projects_tree_menu.html.erb  |  2 -
 .../app/views/layouts/application.html.erb    | 22 ++++---
 4 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/apps/workbench/app/controllers/collections_controller.rb b/apps/workbench/app/controllers/collections_controller.rb
index 5a7a52207b..8547819090 100644
--- a/apps/workbench/app/controllers/collections_controller.rb
+++ b/apps/workbench/app/controllers/collections_controller.rb
@@ -43,6 +43,9 @@ class CollectionsController < ApplicationController
   end
 
   def choose
+    # Always offer a Projects dropdown when choosing collections.
+    params[:by_project] = true
+
     params[:limit] ||= 40
 
     filter = [['link_class','=','name'],
diff --git a/apps/workbench/app/views/application/_choose.html.erb b/apps/workbench/app/views/application/_choose.html.erb
index 07edb4761e..e8cb807592 100644
--- a/apps/workbench/app/views/application/_choose.html.erb
+++ b/apps/workbench/app/views/application/_choose.html.erb
@@ -12,41 +12,38 @@
       </div>
 
       <div class="modal-body">
-	<% if params[:by_project] %>
-	<div class="btn-group">
-	  <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
-	    Projects <span class="caret"></span>
-	  </button>
-            <%= render partial: "projects_tree_menu", locals: {
-                  :project_link_to => Proc.new do |pnode, &block|
-                    link_to "#", {"class" => "chooser-show-project", "data-project-uuid" => pnode[:object].uuid }, &block
-                   end,
-                  :top_button => Proc.new do %>
-                    <% link_to "#", {"class" => "chooser-show-project btn btn-xs btn-default pull-right" } do %>
-                      All <%= controller.model_class.class_for_display.pluralize.downcase %>
-                    <% end %>
-                  <% end %>
-             <% } %>
-            </li>
-            <li class="nav-separator">
-              <i class="fa fa-lg fa-angle-double-right"></i>
-            </li>
-            <li><p class="navbar-text" id="chooser-breadcrumb">All <%= controller.model_class.class_for_display.pluralize.downcase %></span></li>
-          </ul>
-          <div class="navbar-form navbar-right">
-            <input type="text" class="form-control filterable-control" placeholder="Search" data-filterable-target=".modal.arv-choose .selectable-container"/>
-          </div>
+        <div class="input-group">
+          <% if params[:by_project] %>
+            <div class="input-group-btn">
+              <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+                Projects <span class="caret"></span>
+              </button>
+              <ul class="dropdown-menu" role="menu">
+                <%= render partial: "projects_tree_menu", locals: {
+                      :project_link_to => Proc.new do |pnode, &block|
+                        link_to "#", {"class" => "chooser-show-project", "data-project-uuid" => pnode[:object].uuid }, &block
+                       end,
+                      :top_button => Proc.new do %>
+                        <% link_to "#", {"class" => "chooser-show-project btn btn-xs btn-default pull-right" } do %>
+                          All <%= controller.model_class.class_for_display.pluralize.downcase %>
+                        <% end %>
+                      <% end %>
+                <% } %>
+                <li class="divider" />
+                <li><span class="navbar-text" id="chooser-breadcrumb">All <%= controller.model_class.class_for_display.pluralize.downcase %></span></li>
+              </ul>
+            </div>
+          <% end %>
+          <input type="text" class="form-control filterable-control" placeholder="Search" data-filterable-target=".modal.arv-choose .selectable-container"/>
         </div>
-        <% end %>
-
         <div class="row" style="height: 20em">
-          <div class="col-sm-6 container-fluid arv-filterable-list selectable-container"
-               style="height: 100%; overflow-y: scroll"
-               data-infinite-scroller="#choose-scroll"
-               id="choose-scroll"
-               data-infinite-content-href="<%= @next_page_href %>">
-            <%= render partial: 'choose_rows', locals: {multiple: multiple} %>
-          </div>
+	  <div class="col-sm-6 container arv-filterable-list selectable-container"
+	       style="height: 100%; overflow-y: scroll"
+	       data-infinite-scroller="#choose-scroll"
+	       id="choose-scroll"
+	       data-infinite-content-href="<%= @next_page_href %>">
+	    <%= render partial: 'choose_rows', locals: {multiple: multiple} %>
+	  </div>
           <div class="col-sm-6 modal-dialog-preview-pane" style="height: 100%; overflow-y: scroll">
           </div>
         </div>
diff --git a/apps/workbench/app/views/application/_projects_tree_menu.html.erb b/apps/workbench/app/views/application/_projects_tree_menu.html.erb
index 5015fa83a5..876b0be65c 100644
--- a/apps/workbench/app/views/application/_projects_tree_menu.html.erb
+++ b/apps/workbench/app/views/application/_projects_tree_menu.html.erb
@@ -1,4 +1,3 @@
-            <ul class="dropdown-menu" role="menu">
               <li role="presentation" class="dropdown-header">
                 <%= top_button.call %>
                 My projects
@@ -23,4 +22,3 @@
                   <% end %>
                 </li>
               <% end %>
-            </ul>
diff --git a/apps/workbench/app/views/layouts/application.html.erb b/apps/workbench/app/views/layouts/application.html.erb
index feaa7dbd37..2418489789 100644
--- a/apps/workbench/app/views/layouts/application.html.erb
+++ b/apps/workbench/app/views/layouts/application.html.erb
@@ -187,16 +187,18 @@
               Projects
               <span class="caret"></span>
             </a>
-            <%= render partial: "projects_tree_menu", locals: {
-                  :project_link_to => Proc.new do |pnode, &block|
-                    link_to(project_path(pnode[:object].uuid), data: {object_uuid: pnode[:object].uuid, name: 'name'}, &block)
-                  end,
-                  :top_button => Proc.new do %>
-                    <% link_to projects_path, method: 'post', class: 'btn btn-xs btn-default pull-right' do %>
-                      <i class="fa fa-plus"></i> New project
-                    <% end %>
-                  <% end %>
-            <% } %>
+            <ul class="dropdown-menu" role="menu">
+	      <%= render partial: "projects_tree_menu", locals: {
+		    :project_link_to => Proc.new do |pnode, &block|
+		      link_to(project_path(pnode[:object].uuid), data: {object_uuid: pnode[:object].uuid, name: 'name'}, &block)
+		    end,
+		    :top_button => Proc.new do %>
+		      <% link_to projects_path, method: 'post', class: 'btn btn-xs btn-default pull-right' do %>
+			<i class="fa fa-plus"></i> New project
+		      <% end %>
+		    <% end %>
+	      <% } %>
+	    </ul>
           </li>
           <% project_breadcrumbs.each do |p| %>
             <li class="nav-separator">
-- 
2.30.2