[ARVADOS] updated: 09e3c7102376790a2a6bebb0c77f43fa271f6d74

[git at public.curoverse.com]

Summary of changes:
 .../workbench/app/assets/javascripts/filterable.js |  4 +-
 .../app/assets/javascripts/select_modal.js         | 51 ++++++++++++++++++++--
 .../app/controllers/actions_controller.rb          |  6 ++-
 .../workbench/app/controllers/search_controller.rb | 13 +++++-
 apps/workbench/app/views/application/404.html.erb  |  7 +--
 .../workbench/app/views/application/_choose.js.erb |  1 -
 apps/workbench/app/views/layouts/body.html.erb     | 30 +++++--------
 .../app/views/search/_choose_rows.html.erb         |  8 +++-
 .../controllers/arvados/v1/groups_controller.rb    | 28 +++++++-----
 ... => 20140607150616_rename_folder_to_project.rb} |  0
 .../db/migrate/20140714184006_empty_collection.rb  |  4 +-
 services/api/db/structure.sql                      |  2 +
 services/api/lib/current_api_client.rb             |  2 +-
 .../arvados/v1/groups_controller_test.rb           | 34 ++++++++-------
 14 files changed, 125 insertions(+), 65 deletions(-)
 rename services/api/db/migrate/{20140607150616_rename_folder_to_project.rb_deferred => 20140607150616_rename_folder_to_project.rb} (100%)

       via  09e3c7102376790a2a6bebb0c77f43fa271f6d74 (commit)
       via  3bdc5e4dee5990218885f68a3463c230135396ea (commit)
       via  c69a557d26d65b0a89a363d23b86f50fd7d0e9bd (commit)
       via  ea94b2feb2cba9ee11b728256a8c947fb46f8493 (commit)
       via  c7bf82b621dae10a68a74b95439fa8f4ae3c502f (commit)
       via  98721242a9eff3f0f21a75aaac0ce3abeb7c3391 (commit)
       via  249979c4f51961364f1f7412e20266b5746b14ac (commit)
       via  ab58549b6249224decdb913097f1649e993b95a7 (commit)
       via  45dd2c3f3db472132974aeb4fe3f0e0f4e57dd13 (commit)
       via  04cdd8c9292523aaca50ff6f41791ea54ee91e3b (commit)
       via  4b007d7c702987f3b65d0c3fec5b21dcf6ac647c (commit)
       via  6790e24febd872dcf98b1356ad1d06fc69fc2915 (commit)
       via  4aae92930a32c99bc803ddfedc7b21715a5a77b7 (commit)
       via  d82f1a45af0702c68b6bf93b887a8c94c078ce4d (commit)
       via  08c991e7ce24f6424b0916dec3d6077e56ffcdba (commit)
       via  19c20b239f9d88f6fd4dab542524143f24cc8536 (commit)
       via  72ea413fc98371c50196f337f104807ab7472288 (commit)
      from  da7d1fa4d078d0d7785672a195b16a9134478b0d (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 09e3c7102376790a2a6bebb0c77f43fa271f6d74
Merge: da7d1fa 3bdc5e4
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Jul 31 20:59:59 2014 -0400

    Merge branch '3235-top-nav-site-search' refs #3235


commit 3bdc5e4dee5990218885f68a3463c230135396ea
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Jul 31 20:59:41 2014 -0400

    3235: Fix test

diff --git a/services/api/test/functional/arvados/v1/groups_controller_test.rb b/services/api/test/functional/arvados/v1/groups_controller_test.rb
index 0110e65..c4e22f1 100644
--- a/services/api/test/functional/arvados/v1/groups_controller_test.rb
+++ b/services/api/test/functional/arvados/v1/groups_controller_test.rb
@@ -91,7 +91,7 @@ class Arvados::V1::GroupsControllerTest < ActionController::TestCase
   end
 
   [false, true].each do |include_linked|
-    test 'list objects across multiple projects' do
+    test "list objects across projects, include_linked=#{include_linked}" do
       authorize_with :project_viewer
       get :contents, {
         format: :json,

commit c69a557d26d65b0a89a363d23b86f50fd7d0e9bd
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Jul 31 20:53:24 2014 -0400

    3235: Show uuid without "unnamed -" prefix for nameless objects.

diff --git a/apps/workbench/app/views/search/_choose_rows.html.erb b/apps/workbench/app/views/search/_choose_rows.html.erb
index 0a73a41..61f9300 100644
--- a/apps/workbench/app/views/search/_choose_rows.html.erb
+++ b/apps/workbench/app/views/search/_choose_rows.html.erb
@@ -19,7 +19,7 @@
         <%= object.name %>
         <span style="display:none"><%= object.uuid %></span>
       <% else %>
-        unnamed - <span class="arvados-uuid"><%= object.uuid %></span>
+        <span class="arvados-uuid"><%= object.uuid %></span>
       <% end %>
     </div>
   </div>

commit ea94b2feb2cba9ee11b728256a8c947fb46f8493
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Jul 31 20:52:22 2014 -0400

    3235: Fix UrlGenerationError on 404 page.

diff --git a/apps/workbench/app/views/application/404.html.erb b/apps/workbench/app/views/application/404.html.erb
index 86e04ce..fd97295 100644
--- a/apps/workbench/app/views/application/404.html.erb
+++ b/apps/workbench/app/views/application/404.html.erb
@@ -1,7 +1,8 @@
 <%
    if (controller.andand.action_name == 'show') and params[:uuid]
-     class_name = controller.model_class.to_s.underscore.humanize(capitalize: false)
-     req_item = safe_join([class_name, " with UUID ",
+     class_name = controller.model_class.to_s.underscore
+     class_name_h = class_name.humanize(capitalize: false)
+     req_item = safe_join([class_name_h, " with UUID ",
                            raw("<code>"), params[:uuid], raw("</code>")], "")
    else
      req_item = "page you requested"
@@ -14,7 +15,7 @@
 
 <% if class_name %>
 Perhaps you'd like to
-<%= link_to("browse all #{class_name.pluralize}", action: :index, controller: class_name.tableize) %>?
+<%= link_to("browse all #{class_name_h.pluralize}", action: :index, controller: class_name.tableize) %>?
 <% end %>
 
 </p>

commit c7bf82b621dae10a68a74b95439fa8f4ae3c502f
Merge: 9872124 da7d1fa
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Jul 31 20:25:43 2014 -0400

    3235: Merge branch 'master' into 3235-top-nav-site-search


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


hooks/post-receive
--