[ARVADOS] updated: 89d46fe3c760785315ed1f53087e7aa2368f6f30

[git at public.curoverse.com]

Summary of changes:
 .../arvados/v1/keep_disks_controller.rb            |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

       via  89d46fe3c760785315ed1f53087e7aa2368f6f30 (commit)
      from  a2cfa777daee2cf7775c8a24cde16fdc2f48060d (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 89d46fe3c760785315ed1f53087e7aa2368f6f30
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Jan 15 14:41:09 2014 -0800

    Inactive users can get a list of Keep disks.
    
    (Otherwise they cannot retrieve user agreements.)

diff --git a/services/api/app/controllers/arvados/v1/keep_disks_controller.rb b/services/api/app/controllers/arvados/v1/keep_disks_controller.rb
index 31327ad..0da729c 100644
--- a/services/api/app/controllers/arvados/v1/keep_disks_controller.rb
+++ b/services/api/app/controllers/arvados/v1/keep_disks_controller.rb
@@ -37,11 +37,8 @@ class Arvados::V1::KeepDisksController < ApplicationController
   end
 
   def find_objects_for_index
-    if current_user.andand.is_admin || !current_user.andand.is_active
-      super
-    else
-      # active non-admin users can list all keep disks
-      @objects = model_class.all
-    end
+    # all users can list all keep disks
+    @objects = model_class.where('1=1')
+    super
   end
 end

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


hooks/post-receive
--