projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into origin-2608-websocket-event-bus-alt2
[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 af0b533c7525c8ad20fcbfb252c5d25047d01662..e7e5c1a83376feaf501f7d94ed2cea907ce5877d 100644
(file)
--- a/
services/api/app/models/log.rb
+++ b/
services/api/app/models/log.rb
@@
-4,21
+4,27
@@
class Log < ArvadosModel
include CommonApiTemplate
serialize :properties, Hash
before_validation :set_default_event_at
include CommonApiTemplate
serialize :properties, Hash
before_validation :set_default_event_at
- attr_accessor :object
+ attr_accessor :object
, :object_kind
api_accessible :user, extend: :common do |t|
api_accessible :user, extend: :common do |t|
- t.add :object_kind
t.add :object_uuid
t.add :object_uuid
- t.add :object, :if => :object
+ t.add :object_owner_uuid
+ t.add :object_kind
t.add :event_at
t.add :event_type
t.add :summary
t.add :properties
end
t.add :event_at
t.add :event_type
t.add :summary
t.add :properties
end
+ def object_kind
+ if k = ArvadosModel::resource_class_for_uuid(object_uuid)
+ k.kind
+ end
+ end
+
def fill_object(thing)
def fill_object(thing)
- self.object_kind ||= thing.kind
self.object_uuid ||= thing.uuid
self.object_uuid ||= thing.uuid
+ self.object_owner_uuid = thing.owner_uuid
self.summary ||= "#{self.event_type} of #{thing.uuid}"
self
end
self.summary ||= "#{self.event_type} of #{thing.uuid}"
self
end
@@
-60,4
+66,9
@@
class Log < ArvadosModel
def log_change(event_type)
# Don't log changes to logs.
end
def log_change(event_type)
# Don't log changes to logs.
end
+
+ def ensure_valid_uuids
+ # logs can have references to deleted objects
+ end
+
end
end