projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '6520-nodemanager-crunchv2' refs #6520
[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 f8d624acb77c19261dcd16f5b2780653d774ac97..3207d1f288f2f264c671d6709063d93140ce3fec 100644
(file)
--- a/
services/api/app/models/log.rb
+++ b/
services/api/app/models/log.rb
@@
-4,7
+4,6
@@
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, :object_kind
after_save :send_notify
api_accessible :user, extend: :common do |t|
after_save :send_notify
api_accessible :user, extend: :common do |t|
@@
-47,7
+46,7
@@
class Log < ArvadosModel
self.event_at = thing.created_at
when "update"
self.event_at = thing.modified_at
self.event_at = thing.created_at
when "update"
self.event_at = thing.modified_at
- when "de
stroy
"
+ when "de
lete
"
self.event_at = db_current_time
end
self
self.event_at = db_current_time
end
self