[ARVADOS] updated: ce62ed02dd1a543ddaf36c41ddfd2e5fcfbfa4b8

[git at public.curoverse.com]

Summary of changes:
 .../app/controllers/application_controller.rb      |  28 +-
 .../views/application/_selection_checkbox.html.erb |   2 +-
 .../app/views/collections/_choose_rows.html.erb    |   2 -
 .../test/functional/projects_controller_test.rb    |  17 +-
 sdk/cli/bin/arv                                    | 474 ++++++++++++++-------
 sdk/cli/bin/arv-keepdocker                         |   1 +
 sdk/cli/bin/arv-mount                              |   2 +-
 sdk/cli/bin/arv-run-pipeline-instance              |   4 +-
 8 files changed, 354 insertions(+), 176 deletions(-)
 create mode 120000 sdk/cli/bin/arv-keepdocker

       via  ce62ed02dd1a543ddaf36c41ddfd2e5fcfbfa4b8 (commit)
       via  b72f2ecd46d9723d59f3a826ecac16e7dbd2a00a (commit)
       via  5f0b3d260e1ee55969a6954aff1d650bf06e693b (commit)
       via  8fc3ca1a1f521dfe77ebeb2b9b26691dab0313f8 (commit)
       via  4bd75291b6e3c6ae2a5c7efd17ee27dfd844f4e0 (commit)
       via  4e900962d49cc0fe7832854c2eee0c45bfabba38 (commit)
       via  cdd94fae8d40ad6dcee3de5d36de2d89921fd12d (commit)
       via  18bc014a54c8e9594e6c5efad37dcd1a8776f6a5 (commit)
       via  b653edb9423532b89f9f534033fc5587798b0743 (commit)
       via  d42b1376a1ed33ddeaa1c8269c7947dbd6596596 (commit)
       via  4a70edc75187b6b36ea7c7dfde5e3e1f523d8213 (commit)
       via  eaeee8fe0ef4f7fe5b5a3a1124be1275d0b0502e (commit)
       via  d8277401f758f9a45dfa166205e3b77708ac142d (commit)
       via  703281ec6c4d82bff1736788c8e93155f53663f9 (commit)
       via  5be63dcb589e10fbfc11fdd85dcb382708852baa (commit)
       via  9f3ea8afe4b2fe8274cafabef31645ba18e04239 (commit)
      from  b78fae0b4f9633b59ce2f0bea9d75ce5ec96065f (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 ce62ed02dd1a543ddaf36c41ddfd2e5fcfbfa4b8
Merge: 18bc014 b72f2ec
Author: radhika <radhika at curoverse.com>
Date:   Mon Jun 23 10:50:18 2014 -0400

    Merge branch 'master' into 2659-anonymous-group


commit 18bc014a54c8e9594e6c5efad37dcd1a8776f6a5
Author: radhika <radhika at curoverse.com>
Date:   Mon Jun 23 06:44:33 2014 -0400

    2659: handle find object errors when a bookmark or unauthorized object is accessed.

diff --git a/apps/workbench/app/controllers/application_controller.rb b/apps/workbench/app/controllers/application_controller.rb
index 82191ec..c2ae48c 100644
--- a/apps/workbench/app/controllers/application_controller.rb
+++ b/apps/workbench/app/controllers/application_controller.rb
@@ -344,7 +344,15 @@ class ApplicationController < ActionController::Base
           @name_link = Link.find(params[:uuid])
           @object = model_class.find(@name_link.head_uuid)
         else
-          @object = model_class.find(params[:uuid])
+          if Thread.current[:arvados_anonymous_api_token]
+            begin
+              @object = model_class.find(params[:uuid])
+            rescue
+              # not authorized
+            end
+          else
+            @object = model_class.find(params[:uuid])
+          end
         end
       end
     else
diff --git a/apps/workbench/test/functional/projects_controller_test.rb b/apps/workbench/test/functional/projects_controller_test.rb
index d83a40a..b338aa8 100644
--- a/apps/workbench/test/functional/projects_controller_test.rb
+++ b/apps/workbench/test/functional/projects_controller_test.rb
@@ -1,7 +1,7 @@
 require 'test_helper'
 
 class ProjectsControllerTest < ActionController::TestCase
-  test "inactive user is asked to sign user agreements on front page when anonymous user token is not configured" do
+  test "inactive user is asked to sign user agreements on front page" do
     get :index, {}, session_for(:inactive)
     assert_response :success
     assert_not_empty assigns(:required_user_agreements),
@@ -9,19 +9,4 @@ class ProjectsControllerTest < ActionController::TestCase
     assert_template 'user_agreements/index',
     "Inactive user was not presented with a user agreement at the front page"
   end
-
-  test "inactive user is asked to sign user agreements on front page" do
-    get :index, {}, session_for(:inactive)
-    assert_response :success
-    if !@anonymous_token
-      assert_not_empty assigns(:required_user_agreements),
-      "Inactive user did not have required_user_agreements"
-      assert_template 'user_agreements/index',
-      "Inactive user was not presented with a user agreement at the front page"
-    else
-      assert_nil assigns(:required_user_agreements),
-      "Inactive user did not have required_user_agreements"
-    end
-  end
-
 end

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


hooks/post-receive
--