3504: Fix collection page rendering to work with collections as regular uuids.

[arvados.git] / apps / workbench / app / views / application / _choose.html.erb

diff --git a/apps/workbench/app/views/application/_choose.html.erb b/apps/workbench/app/views/application/_choose.html.erb
index 0d3f71b12459604e099fd5926e8159c9eefbe3c2..68351a94995121f5fbf90860412fbf4f5c2a4ee9 100644 (file)
--- a/apps/workbench/app/views/application/_choose.html.erb
+++ b/apps/workbench/app/views/application/_choose.html.erb
@@ -8,10 +8,21 @@
 
       <div class="modal-body">
         <div class="input-group">
-          <% if params[:by_project] != false %>
+          <% if params[:by_project].to_s != "false" %>
+            <% selected_project_name = 'All projects'
+               @filters.andand.each do |attr, op, val|
+                 if attr == 'owner_uuid' and op == '='
+                   if val == current_user.uuid
+                     selected_project_name = "Home"
+                   else
+                     selected_project_name = Group.find(val).name rescue val
+                   end
+                 end
+               end
+               %>
             <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>
+                <%= selected_project_name %> <span class="caret"></span>
               </button>
               <ul class="dropdown-menu" role="menu">
                 <li>
@@ -36,10 +47,10 @@
         </div>
         <div style="height: 1em" />
 
-        <% preview_pane = (params[:preview_pane] != "false")
-           pane_col_class = preview_pane ? "col-sm-6" : "" %>
+        <% preview_pane = (params[:preview_pane].to_s != "false")
+           pane_col_class = preview_pane ? "col-sm-6" : "col-sm-12" %>
         <div class="row" style="height: 20em">
-         <div class="col-sm-6 container arv-filterable-list selectable-container <%= 'multiple' if multiple %>"
+         <div class="<%= pane_col_class %> container arv-filterable-list selectable-container <%= 'multiple' if multiple %>"
               style="height: 100%; overflow-y: scroll"
               data-infinite-scroller="#choose-scroll"
               id="choose-scroll"
@@ -47,8 +58,10 @@
               data-infinite-content-href0="<%= url_for partial: true %>">
            <%= render partial: 'choose_rows' %>
          </div>
-          <div class="col-sm-6 modal-dialog-preview-pane" style="height: 100%; overflow-y: scroll">
+          <% if preview_pane %>
+          <div class="col-sm-6 visible-md visible-lg modal-dialog-preview-pane" style="height: 100%; overflow-y: scroll">
           </div>
+          <% end %>
         </div>
 
         <div class="modal-footer">