Merge branch 'master' into 2449-keep-flags

[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 08038db553307fb129fae27b63ff56b7a9f826b5..af0b533c7525c8ad20fcbfb252c5d25047d01662 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
-  before_save { self.owner_uuid = self.system_user_uuid }
   attr_accessor :object
 
   api_accessible :user, extend: :common do |t|
@@ -17,22 +16,21 @@ class Log < ArvadosModel
     t.add :properties
   end
 
-  def self.start_from(thing, event_type)
-    self.new do |log|
-      log.event_type = event_type
-      log.properties = {
-        'old_etag' => nil,
-        'old_attributes' => nil,
-      }
-      log.seed_basics_from thing
-    end
+  def fill_object(thing)
+    self.object_kind ||= thing.kind
+    self.object_uuid ||= thing.uuid
+    self.summary ||= "#{self.event_type} of #{thing.uuid}"
+    self
+  end
+
+  def fill_properties(age, etag_prop, attrs_prop)
+    self.properties.merge!({"#{age}_etag" => etag_prop,
+                             "#{age}_attributes" => attrs_prop})
   end
 
   def update_to(thing)
-    self.seed_basics_from thing
-    self.properties["new_etag"] = thing.andand.etag
-    self.properties["new_attributes"] = thing.andand.attributes
-    case self.event_type
+    fill_properties('new', thing.andand.etag, thing.andand.logged_attributes)
+    case event_type
     when "create"
       self.event_at = thing.created_at
     when "update"
@@ -40,14 +38,7 @@ class Log < ArvadosModel
     when "destroy"
       self.event_at = Time.now
     end
-  end
-
-  def seed_basics_from(thing)
-    if not thing.nil?
-      self.object_kind ||= thing.kind
-      self.object_uuid ||= thing.uuid
-      self.summary ||= "#{self.event_type} of #{thing.uuid}"
-    end
+    self
   end
 
   protected
@@ -57,14 +48,16 @@ class Log < ArvadosModel
   end
 
   def permission_to_update
-    false
+    current_user.andand.is_admin
   end
 
-  def permission_to_destroy
-    false
-  end
+  alias_method :permission_to_delete, :permission_to_update
 
   def set_default_event_at
     self.event_at ||= Time.now
   end
+
+  def log_change(event_type)
+    # Don't log changes to logs.
+  end
 end