Merge remote-tracking branch 'origin/master' into origin-2608-websocket-event-bus...

[arvados.git] / services / api / app / models / arvados_model.rb

diff --git a/services/api/app/models/arvados_model.rb b/services/api/app/models/arvados_model.rb
index c87a909e0643b932e2340264416f38b70e0e992c..097b8db9df134c14a908e22667ee102d43fd84eb 100644 (file)
--- a/services/api/app/models/arvados_model.rb
+++ b/services/api/app/models/arvados_model.rb
@@ -47,9 +47,7 @@ class ArvadosModel < ActiveRecord::Base
   def self.searchable_columns operator
     textonly_operator = !operator.match(/[<=>]/)
     self.columns.collect do |col|
-      if col.name == 'owner_uuid'
-        nil
-      elsif [:string, :text].index(col.type)
+      if [:string, :text].index(col.type)
         col.name
       elsif !textonly_operator and [:datetime, :integer].index(col.type)
         col.name
@@ -75,6 +73,11 @@ class ArvadosModel < ActiveRecord::Base
   # end
 
   def self.readable_by user
+    if user.is_admin
+      # Admins can read anything, so return immediately.
+      return self
+    end
+
     uuid_list = [user.uuid, *user.groups_i_can(:read)]
     sanitized_uuid_list = uuid_list.
       collect { |uuid| sanitize(uuid) }.join(', ')
@@ -100,8 +103,6 @@ class ArvadosModel < ActiveRecord::Base
     # Link is any permission link ('write' and 'manage' implicitly include 'read')
     # The existence of such a link is tested in the where clause as permissions.head_uuid IS NOT NULL.
     # or
-    # User is admin
-    # or
     # This row is owned by this user, or owned by a group readable by this user
     # or
     # This is the users table
@@ -115,8 +116,8 @@ class ArvadosModel < ActiveRecord::Base
     # This object described by this row is owned by this user, or owned by a group readable by this user
 
     joins("LEFT JOIN links permissions ON permissions.head_uuid in (#{table_name}.owner_uuid, #{table_name}.uuid #{or_object_uuid}) AND permissions.tail_uuid in (#{sanitized_uuid_list}) AND permissions.link_class='permission'").
-      where("permissions.head_uuid IS NOT NULL OR ?=? OR #{table_name}.owner_uuid in (?) #{or_row_is_me} #{or_references_me} #{or_object_owner}",
-            user.is_admin, true, uuid_list).uniq
+      where("permissions.head_uuid IS NOT NULL OR #{table_name}.owner_uuid in (?) #{or_row_is_me} #{or_references_me} #{or_object_owner}",
+            uuid_list).uniq
   end
 
   def logged_attributes