X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/61ee10791b2b1f3724e6a8736c93161a625b5246..eae48c31bb338689ec67fbc6a14a2e0b1fb5e3b6:/services/api/app/models/log.rb?ds=sidebyside

diff --git a/services/api/app/models/log.rb b/services/api/app/models/log.rb
index 5a58a551f1..7eab402609 100644
--- a/services/api/app/models/log.rb
+++ b/services/api/app/models/log.rb
@@ -47,24 +47,26 @@ class Log < ArvadosModel
       self.event_at = thing.created_at
     when "update"
       self.event_at = thing.modified_at
-    when "destroy"
+    when "delete"
       self.event_at = db_current_time
     end
     self
   end
 
-  def self.readable_by *users_list
+  def self.readable_by(*users_list)
     if users_list.select { |u| u.is_admin }.any?
       return self
     end
     user_uuids = users_list.map { |u| u.uuid }
     uuid_list = user_uuids + users_list.flat_map { |u| u.groups_i_can(:read) }
+    uuid_list.uniq!
     permitted = "(SELECT head_uuid FROM links WHERE link_class='permission' AND tail_uuid IN (:uuids))"
     joins("LEFT JOIN container_requests ON container_requests.container_uuid=logs.object_uuid").
       where("logs.object_uuid IN #{permitted} OR "+
             "container_requests.uuid IN (:uuids) OR "+
             "container_requests.owner_uuid IN (:uuids) OR "+
             "logs.object_uuid IN (:uuids) OR "+
+            "logs.owner_uuid IN (:uuids) OR "+
             "logs.object_owner_uuid IN (:uuids)",
             uuids: uuid_list)
   end