[ARVADOS] updated: 1e1712c0cb2f3eb9da5759ef9b356ad52f5749b7

git at public.curoverse.com git at public.curoverse.com
Sun Jul 27 18:22:55 EDT 2014


Summary of changes:
 apps/workbench/app/controllers/collections_controller.rb | 3 ---
 apps/workbench/app/views/application/_choose.html.erb    | 2 +-
 apps/workbench/app/views/layouts/application.html.erb    | 1 -
 3 files changed, 1 insertion(+), 5 deletions(-)

       via  1e1712c0cb2f3eb9da5759ef9b356ad52f5749b7 (commit)
      from  ddfbe0de9bfc6e3d9cb0d26466ac61bb87f5d65a (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 1e1712c0cb2f3eb9da5759ef9b356ad52f5749b7
Author: Tom Clegg <tom at curoverse.com>
Date:   Sun Jul 27 18:22:53 2014 -0400

    3235: Show project filter by default (i.e., unless by_project=false).

diff --git a/apps/workbench/app/controllers/collections_controller.rb b/apps/workbench/app/controllers/collections_controller.rb
index 5d1c49b..fd78ddf 100644
--- a/apps/workbench/app/controllers/collections_controller.rb
+++ b/apps/workbench/app/controllers/collections_controller.rb
@@ -43,9 +43,6 @@ class CollectionsController < ApplicationController
   end
 
   def choose
-    # Always offer a Projects dropdown when choosing collections.
-    params[:by_project] = true
-
     params[:limit] ||= 40
 
     @filters += [['link_class','=','name'],
diff --git a/apps/workbench/app/views/application/_choose.html.erb b/apps/workbench/app/views/application/_choose.html.erb
index 213890c..bf8ea88 100644
--- a/apps/workbench/app/views/application/_choose.html.erb
+++ b/apps/workbench/app/views/application/_choose.html.erb
@@ -9,7 +9,7 @@
       <div class="modal-body">
         <div class="input-group">
           <input type="text" class="form-control filterable-control" placeholder="Search" data-filterable-target=".modal.arv-choose .selectable-container"/>
-          <% if params[:by_project] %>
+          <% if params[:by_project] != 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">
                 Filter by project <span class="caret"></span>
diff --git a/apps/workbench/app/views/layouts/application.html.erb b/apps/workbench/app/views/layouts/application.html.erb
index 86a6892..715acf9 100644
--- a/apps/workbench/app/views/layouts/application.html.erb
+++ b/apps/workbench/app/views/layouts/application.html.erb
@@ -79,7 +79,6 @@
                        action: 'choose',
                        controller: 'search',
                        title: 'Search',
-                       by_project: true,
                        action_name: 'Show',
                        action_href: url_for(controller: :actions, action: :show),
                        action_method: 'get',

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list