Merge branch 'master' into 3504-clients-compatible-with-3036

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

diff --git a/services/api/app/models/log.rb b/services/api/app/models/log.rb
index e7e5c1a83376feaf501f7d94ed2cea907ce5877d..34e6dfa354ca93a742ca4913b89d40d7accab147 100644 (file)
--- a/services/api/app/models/log.rb
+++ b/services/api/app/models/log.rb
@@ -1,5 +1,5 @@
 class Log < ArvadosModel
-  include AssignUuid
+  include HasUuid
   include KindAndEtag
   include CommonApiTemplate
   serialize :properties, Hash
@@ -7,6 +7,7 @@ class Log < ArvadosModel
   attr_accessor :object, :object_kind
 
   api_accessible :user, extend: :common do |t|
+    t.add :id
     t.add :object_uuid
     t.add :object_owner_uuid
     t.add :object_kind
@@ -24,7 +25,11 @@ class Log < ArvadosModel
 
   def fill_object(thing)
     self.object_uuid ||= thing.uuid
-    self.object_owner_uuid = thing.owner_uuid
+    if respond_to? :object_owner_uuid=
+      # Skip this if the object_owner_uuid migration hasn't happened
+      # yet, i.e., we're in the process of migrating an old database.
+      self.object_owner_uuid = thing.owner_uuid
+    end
     self.summary ||= "#{self.event_type} of #{thing.uuid}"
     self
   end
@@ -63,6 +68,10 @@ class Log < ArvadosModel
     self.event_at ||= Time.now
   end
 
+  def log_start_state
+    # don't log start state on logs
+  end
+
   def log_change(event_type)
     # Don't log changes to logs.
   end