projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '3171-group-membership' refs #3171
[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 923a681b0d3a03dc55f671b82063abc286a2601a..34e6dfa354ca93a742ca4913b89d40d7accab147 100644
(file)
--- a/
services/api/app/models/log.rb
+++ b/
services/api/app/models/log.rb
@@
-1,22
+1,35
@@
class Log < ArvadosModel
class Log < ArvadosModel
- include
Assign
Uuid
+ include
Has
Uuid
include KindAndEtag
include CommonApiTemplate
serialize :properties, Hash
before_validation :set_default_event_at
include KindAndEtag
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 :id
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)
self.object_uuid ||= thing.uuid
def fill_object(thing)
self.object_uuid ||= thing.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
self.summary ||= "#{self.event_type} of #{thing.uuid}"
self
end
@@
-55,6
+68,10
@@
class Log < ArvadosModel
self.event_at ||= Time.now
end
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
def log_change(event_type)
# Don't log changes to logs.
end
@@
-62,4
+79,5
@@
class Log < ArvadosModel
def ensure_valid_uuids
# logs can have references to deleted objects
end
def ensure_valid_uuids
# logs can have references to deleted objects
end
+
end
end